X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=d3dc8cbda4ea7c9b311de39595b14ed921acc805;hb=8c1c956b86f3b694bb09aa0d1725aa67c5d8d111;hp=2e9f96358d8a9d84301b7019ea34815b82465f61;hpb=81cb7610337b33508066dd400cd371ff6033c987;p=ghc-hetmet.git diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index 2e9f963..d3dc8cb 100644 --- a/mk/boilerplate.mk +++ b/mk/boilerplate.mk @@ -29,17 +29,21 @@ 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 - @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..." - @( cd $(FPTOOLS_TOP) && ./config.status ) + echo "configure changed, reconfiguring with same settings..."; \ + ( cd $(FPTOOLS_TOP) && ./config.status --recheck ); \ -$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4 - @echo "Regenerating $(FPTOOLS_TOP)/configure..." - @( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure ) +$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure + @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."; + @( cd $(FPTOOLS_TOP) && ./config.status ) # ----------------------------------------------------------------------------- # Misc bits