Cleanup README Makefile installs.

[postgresql] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f54997da424c081d7cbb4359b59c458555c4f1e3..e3e26d483c6d26dd232863b81fb5d94ec3daea14 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
 #
 # PostgreSQL top level makefile
 #
-# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.1 2000/06/06 22:00:45 petere Exp $
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.5 2000/06/14 18:17:24 petere Exp $
 #
 
 srcdir = @srcdir@
@@ -12,19 +12,45 @@ top_builddir = .
 
 
 all:
-       make -C src all
+       $(MAKE) -C src all
        @echo "All of PostgreSQL successfully made. Ready to install."
 
 install:
-       make -C src install
+       $(MAKE) -C src install
        @cat $(srcdir)/register.txt
 
 clean:
-       make -C src clean
+       $(MAKE) -C src clean
 
 distclean:
-       make -C src distclean
+       -$(MAKE) -C src distclean
        -rm -f config.cache config.log config.status GNUmakefile
 
 
 .PHONY: all install clean distclean
+
+
+GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
+       cd $(top_builddir) && ./config.status --recheck
+
+
+# These dependencies are risky because both the target and the sources
+# are in CVS and CVS doesn't preserve timestamps, thus leading to
+# unnecessary reruns of these rules.
+
+AUTOCONF = autoconf
+
+# Only use this rule if you actually said `make configure'.
+ifeq ($(MAKECMDGOALS),configure)
+$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
+       cd $(top_srcdir) && $(AUTOCONF)
+endif
+
+# This one we can leave unprotected because by default nothing depends
+# on aclocal.m4. This rule is only invoked if you say `make
+# aclocal.m4' or `make configure'.
+$(top_srcdir)/aclocal.m4: $(wildcard $(top_srcdir)/config/*.m4)
+       cat $^ > $@