add :cmd

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 7d0d66d..f143535 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,10 +72,15 @@ check-packages :
        @for d in `cat libraries/core-packages`; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \
-            echo "maybe you haven't done 'sh darcs-all get'?"; \
+            echo "maybe you haven't done './darcs-all get'?"; \
             exit 1; \
          fi \
        done
+       @if test ! -e libraries/base/configure; then \
+           echo "Looks like you're missing base's configure script."; \
+           echo "Did you run 'sh boot' at the top level?"; \
+           exit 1; \
+       fi
 
 stage1 : check-packages
        $(MAKE) -C utils/mkdependC boot
@@ -218,10 +223,6 @@ BinDistLinks = ghc ghci ghc-pkg
 BinDistLibSplicedFiles = package.conf
 BinDistDirs = includes compiler docs driver rts utils
 
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
-
 BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
 
 BIN_DIST_TOP= distrib/Makefile \
@@ -327,6 +328,7 @@ binary-dist :: $(BINARY_DIST_DOC_RULES)
 $(BINARY_DIST_DOC_RULES): binary-dist-doc-%:
        $(MAKE) -C $* $(MFLAGS) $(BINDIST_DOC_WAYS)
        $(MAKE) -C $* $(MFLAGS) install-docs \
+                       MAKING_BIN_DIST=1 \
                XMLDocWays="$(BINDIST_DOC_WAYS)" \
                prefix=$(BIN_DIST_DIR) \
                exec_prefix=$(BIN_DIST_DIR) \
@@ -365,53 +367,39 @@ binary-dist::
        done
 endif
 
+.PHONY: binary-dist-doc-%
+
+binary-dist::
+       $(MAKE) -C libraries binary-dist
+
 # Jiggle the files around to make a valid Windows distribution if necessary
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 binary-dist :: fiddle-binary-dist
 endif
 
+.PHONY: fiddle-binary-dist
 fiddle-binary-dist:
-       cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) && ../distrib/prep-bin-dist-mingw
-.PHONY: binary-dist-doc-%
-
-BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
-
-LIBRARY_SUBDIRS=$(shell $(MAKE) -s -C libraries subdirs)
-
-BINARY_DIST_LIBRARY_RULES=$(foreach d,$(LIBRARY_SUBDIRS),binary-dist-lib-$d)
-
-binary-dist:: $(BINARY_DIST_LIBRARY_RULES)
-       cp    libraries/Makefile           $(BIN_DIST_LIBDIR)
-       cp    libraries/gen_contents_index $(BIN_DIST_LIBDIR)
-       cp    libraries/index.html         $(BIN_DIST_LIBDIR)
-       cp    libraries/doc-index.html     $(BIN_DIST_LIBDIR)
-       cp -a libraries/stamp              $(BIN_DIST_LIBDIR)
-
-$(BINARY_DIST_LIBRARY_RULES): binary-dist-lib-%:
-       $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup
-       cp    libraries/$*/setup/Setup   $(BIN_DIST_LIBDIR)/$*/setup
-       cp    libraries/$*/*.cabal       $(BIN_DIST_LIBDIR)/$*
-       cp -a libraries/$*/dist          $(BIN_DIST_LIBDIR)/$*
-       find $(BIN_DIST_LIBDIR)/$*/dist \
-            \( \( -name "*.o" -o -name "*.p_o" \) -a \! -name "HS*" \) \
-            -exec rm {} \;
-
+       cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 # Tar up the distribution and build a manifest
 binary-dist :: tar-binary-dist
 
+.PHONY: tar-binary-dist
 tar-binary-dist:
        ( cd $(BIN_DIST_TOPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
        ( cd $(BIN_DIST_TOPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
 
 # Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-binary-dist ::
+binary-dist :: publish-binary-dist
+endif
+
+.PHONY: publish-binary-dist
+publish-binary-dist :
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
                echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)"; \
-               if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi\
+               if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi; \
        done
        $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
-endif
 
 
 binary-dist::