[project @ 2000-08-25 15:21:57 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index efa8633..9de6247 100644 (file)
--- 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: 
@@ -46,12 +56,12 @@ binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
              distrib/configure-bin.in \
-             README \
              distrib/INSTALL \
              $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
              $(BIN_DIST_MAIN_DIR)/VERSION \
              $(BIN_DIST_MAIN_DIR)/RELEASE \
              $(BIN_DIST_MAIN_DIR)/LICENSE \
+             $(BIN_DIST_MAIN_DIR)/README \
              glafp-utils/mkdirhier/mkdirhier \
              install-sh \
              config.guess \
@@ -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 \