Remove sometimes inaccurate error hint about source of wrongly encoded data.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c71f8a608830cdf798752370479481826cd501f8..d934b19d9515e00955eb575a32766e1a5f9ce5a3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.47 2008/03/18 16:24:50 petere Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009/11/03 21:28:10 petere Exp $
 #
 
 subdir =
@@ -14,13 +14,16 @@ all:
        $(MAKE) -C config all
        @echo "All of PostgreSQL successfully made. Ready to install."
 
+html man:
+       $(MAKE) -C doc $@
+
 install:
        $(MAKE) -C doc $@
        $(MAKE) -C src $@
        $(MAKE) -C config $@
        @echo "PostgreSQL installation complete."
 
-installdirs uninstall:
+installdirs uninstall coverage:
        $(MAKE) -C doc $@
        $(MAKE) -C src $@
        $(MAKE) -C config $@
@@ -67,38 +70,20 @@ distdir     = postgresql-$(VERSION)
 dummy  = =install=
 garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
-dist: $(distdir).tar.gz 
-ifeq ($(split-dist), yes)
-dist: postgresql-base-$(VERSION).tar.gz postgresql-docs-$(VERSION).tar.gz postgresql-opt-$(VERSION).tar.gz postgresql-test-$(VERSION).tar.gz 
-endif
-dist:
+dist: $(distdir).tar.gz $(distdir).tar.bz2
        rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
-opt_files = \
-       src/tools src/tutorial \
-       $(addprefix src/pl/, plperl plpython tcl)
-
-docs_files = doc/postgres.tar.gz doc/src doc/TODO.detail
-
-postgresql-base-$(VERSION).tar: distdir
-       $(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \
-         -f $@ $(distdir)
-
-postgresql-docs-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(docs_files))
-
-postgresql-opt-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(addprefix $(distdir)/, $(opt_files))
+.INTERMEDIATE: $(distdir).tar
 
-postgresql-test-$(VERSION).tar: distdir
-       $(TAR) cf $@ $(distdir)/src/test
+distdir-location:
+       @echo $(distdir)
 
 distdir:
        rm -rf $(distdir)* $(dummy)
-       for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+       for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
          file=`expr X$$x : 'X\./\(.*\)'`; \
          if test -d "$(top_srcdir)/$$file" ; then \
            mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
@@ -115,10 +100,10 @@ distdir:
        $(MAKE) -C $(distdir) distclean
        rm -f $(distdir)/README.CVS
 
-distcheck: $(distdir).tar.gz
+distcheck: dist
        rm -rf $(dummy)
        mkdir $(dummy)
-       $(GZIP) -d -c $< | $(TAR) xf -
+       $(GZIP) -d -c $(distdir).tar.gz | $(TAR) xf -
        install_prefix=`cd $(dummy) && pwd`; \
        cd $(distdir) \
        && ./configure --prefix="$$install_prefix"