One-letter backslash commands now need a space before the first argument.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 581628f77e916f3e9109c07f529fa2a50c8843c6..c71f8a608830cdf798752370479481826cd501f8 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.41 2004/10/06 08:49:58 momjian Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.47 2008/03/18 16:24:50 petere Exp $
 #
 
 subdir =
@@ -20,11 +20,17 @@ install:
        $(MAKE) -C config $@
        @echo "PostgreSQL installation complete."
 
-installdirs uninstall distprep:
+installdirs uninstall:
        $(MAKE) -C doc $@
        $(MAKE) -C src $@
        $(MAKE) -C config $@
 
+distprep:
+       $(MAKE) -C doc $@
+       $(MAKE) -C src $@
+       $(MAKE) -C config $@
+       $(MAKE) -C contrib $@
+
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
 clean:
@@ -38,17 +44,17 @@ clean:
 # Important: distclean `src' last, otherwise Makefile.global
 # will be gone too soon.
 distclean maintainer-clean:
-       -$(MAKE) -C doc $@
-       -$(MAKE) -C contrib $@
-       -$(MAKE) -C config $@
-       -$(MAKE) -C src $@
-       -rm -f config.cache config.log config.status GNUmakefile
+       $(MAKE) -C doc $@
+       $(MAKE) -C contrib $@
+       $(MAKE) -C config $@
+       $(MAKE) -C src $@
+       rm -f config.cache config.log config.status GNUmakefile
 # Garbage from autoconf:
        @rm -rf autom4te.cache/
 
 check: all
 
-check installcheck:
+check installcheck installcheck-parallel:
        $(MAKE) -C src/test $@
 
 GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
@@ -57,25 +63,25 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 
 ##########################################################################
 
-distdir        := postgresql-$(VERSION)
-dummy  := =install=
-garbage := =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
+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:
-       -rm -rf $(distdir)
+       rm -rf $(distdir)
 
 $(distdir).tar: distdir
        $(TAR) chf $@ $(distdir)
 
-opt_files := \
-       src/tools src/corba src/tutorial \
+opt_files = \
+       src/tools src/tutorial \
        $(addprefix src/pl/, plperl plpython tcl)
 
-docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail
+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) \
@@ -91,7 +97,7 @@ postgresql-test-$(VERSION).tar: distdir
        $(TAR) cf $@ $(distdir)/src/test
 
 distdir:
-       -rm -rf $(distdir)* $(dummy)
+       rm -rf $(distdir)* $(dummy)
        for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
          file=`expr X$$x : 'X\./\(.*\)'`; \
          if test -d "$(top_srcdir)/$$file" ; then \
@@ -102,11 +108,15 @@ distdir:
          fi || exit; \
        done
        $(MAKE) -C $(distdir) distprep
+       $(MAKE) -C $(distdir)/doc/src/sgml/ HISTORY INSTALL regress_README
+       cp $(distdir)/doc/src/sgml/HISTORY $(distdir)/
+       cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
+       cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
        $(MAKE) -C $(distdir) distclean
        rm -f $(distdir)/README.CVS
 
 distcheck: $(distdir).tar.gz
-       -rm -rf $(dummy)
+       rm -rf $(dummy)
        mkdir $(dummy)
        $(GZIP) -d -c $< | $(TAR) xf -
        install_prefix=`cd $(dummy) && pwd`; \
@@ -121,7 +131,7 @@ distcheck: $(distdir).tar.gz
        $(MAKE) -C $(distdir) dist
 # Room for improvement: Check here whether this distribution tarball
 # is sufficiently similar to the original one.
-       -rm -rf $(distdir) $(dummy)
+       rm -rf $(distdir) $(dummy)
        @echo "Distribution integrity checks out."
 
 .PHONY: dist distdir distcheck