[project @ 2004-09-10 09:46:21 by simonmar]

Update to previous commit: avoid non-portable features of test(1).  It
looks better this way, anyway.

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index e7f6bea..bb6483a 100644 (file)
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -29,22 +29,22 @@ default: all
 # -----------------------------------------------------------------------------
 #      make sure the autoconf stuff is up to date...
 
-$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure 
+$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
+       @echo "Running autoreconf in $(FPTOOLS_TOP)  ..."
+       @( cd $(FPTOOLS_TOP) && autoreconf )
+
+$(TOP)/config.status : $(TOP)/configure
        @if test ! -f $(FPTOOLS_TOP)/config.status; then \
                echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
                exit 1; \
        fi
-       @if test $(FPTOOLS_TOP)/configure -nt $(FPTOOLS_TOP)/mk/config.mk; then \
-               echo "configure changed, reconfiguring with same settings..."; \
-               ( cd $(FPTOOLS_TOP) && ./config.status --recheck ); \
-       fi
+       echo "configure changed, reconfiguring with same settings..."; \
+       ( cd $(FPTOOLS_TOP) && ./config.status --recheck ); \
+
+$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure $(TOP)/config.status
        @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info...";
        @( cd $(FPTOOLS_TOP) && ./config.status )
 
-$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
-       @echo "Running autoreconf in $(FPTOOLS_TOP)  ..."
-       @( cd $(FPTOOLS_TOP) && autoreconf )
-
 # -----------------------------------------------------------------------------
 # Misc bits