summaryrefslogtreecommitdiff
path: root/mk/boilerplate.mk
diff options
context:
space:
mode:
authorsimonmar <unknown>2004-09-10 09:46:21 +0000
committersimonmar <unknown>2004-09-10 09:46:21 +0000
commit1f81c9b1f21945b2e6772828576e766e6f1238cf (patch)
tree05e13d08e4d478cb88e06951b2f8a0b355bbe988 /mk/boilerplate.mk
parentb0306f6e4545478d031ff619ee7c666cc1d8d381 (diff)
downloadhaskell-1f81c9b1f21945b2e6772828576e766e6f1238cf.tar.gz
[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.
Diffstat (limited to 'mk/boilerplate.mk')
-rw-r--r--mk/boilerplate.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index e7f6beaf62..bb6483aa6a 100644
--- 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