X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=bb6483aa6a1bdcb0ae97081be146df2c4ee3c2b4;hb=1f81c9b1f21945b2e6772828576e766e6f1238cf;hp=1066cd555898fd168ab11d1dc865732070e79a34;hpb=2f1889c3bdccc3b02d1741aeb4c0493434b12309;p=ghc-hetmet.git diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index 1066cd5..bb6483a 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.in $(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 $(TOP)/config.status + @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."; + @( cd $(FPTOOLS_TOP) && ./config.status ) # ----------------------------------------------------------------------------- # Misc bits