X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9b02279eefb00835eb2928a9a3a65e594f42e6a5;hb=ee7aa7a67308ea2e8f3cca59ef7a7193291059a8;hp=efa863360e2784b3654991ffbf104cff63d7bbf2;hpb=40ba9488141a136d39e050e6723eb56b2a7a28a8;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index efa8633..9b02279 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,16 @@ SRC_DIST_DIRS += mk docs distrib $(ProjectsToBuild) SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 acconfig.h README INSTALL Makefile install-sh # ----------------------------------------------------------------------------- +# Make sure configure is up-to-date + +all boot :: configure +configure :: configure.in + @echo "WARNING: configure needs to be regenerated. Type" + @echo " make -f Makefile.config ./configure" + @echo "and rerun make." + @exit 16 + +# ----------------------------------------------------------------------------- # Making a binary distribution # # To make a particular binary distribution: @@ -131,7 +141,7 @@ binary-dist :: echo Making $$way documentation in $$dir && \ $(MAKE) -C $$dir --no-print-directory $(MFLAGS) $$way >.doclog 2>&1 && \ if [ "$$way" = "html" ]; then \ - for subdir in `perl -n -e '/output will be in ([_A-Za-z0-9]*)/ && do { print $$1; };' <.doclog`; do \ + for subdir in `perl -n -e '/output will be in ([_\-A-Za-z0-9]*)/ && do { print $$1; };' <.doclog`; do \ echo Copying HTML docs from $$subdir...; \ cp -Rf $$dir/$$subdir $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \ done \