X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c8be56282c3a4d35b322e9b410f7ea93bf27c3f0;hb=78260da4deee97a866ba83f8d73a8284b371f405;hp=d5b925d854edef313312bb0cb1113e59848cd94a;hpb=cfa08d584984b4d1c2695bf373ccf0261d7bc5a9;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index d5b925d..c8be562 100644
--- a/Makefile
+++ b/Makefile
@@ -74,21 +74,12 @@ endif
 
 SUBDIRS = gmp libffi includes utils driver docs rts compiler ghc libraries libraries/Cabal/doc
 
-check-all: check-tools check-packages
-
-check-tools:
-	@:
-ifeq "$(HADDOCK_DOCS)" "YES"
-ifeq "$(HADDOCK)"      ""
-	echo "Couldn't find haddock" >&2
-	exit 1
-endif
-endif
+check-all: check-packages
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-	@ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
+	@ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
 	for d in $$ds; do \
 	  if test ! -d $$d; then \
 	     echo "Looks like you're missing $$d,"; \
@@ -134,7 +125,6 @@ stage1 : $(GCC_LIB_DEP) check-all
 	$(MAKE) -C rts boot
 	$(MAKE) -C rts
 	$(MAKE) -C libraries all
-	$(MAKE) -C utils with-stage-1
 
 # When making distributions (i.e., whether with binary-dist or using the 
 # vanilla install target to create an installer package), we can have problems
@@ -146,8 +136,10 @@ stage1 : $(GCC_LIB_DEP) check-all
 stage2 : check-all
 	$(MAKE) -C compiler stage=2 boot
 	$(MAKE) -C compiler stage=2
+	$(MAKE) -C utils with-stage-2
 ifeq "$(HADDOCK_DOCS)" "YES"
-	$(MAKE) -C compiler stage=2 doc
+	$(MAKE) -C libraries doc
+	$(MAKE) -C compiler  doc stage=2
 endif
 
 stage3 : check-all
@@ -284,7 +276,7 @@ install-docs ::
 
 binary-dist::
 	-rm -rf $(BIN_DIST_DIR)
-	-$(RM) $(BIN_DIST_TARBALL)
+	-$(RM) $(BIN_DIST_TAR_BZ2)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
@@ -304,8 +296,8 @@ binary-dist :: tar-binary-dist
 
 .PHONY: tar-binary-dist
 tar-binary-dist:
-	( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TARBALL) )
-	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
+	( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) )
+	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
 
 else
 
@@ -405,7 +397,7 @@ endif
 	tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
 endif
 
-PUBLISH_FILES = $(BIN_DIST_TARBALL)
+PUBLISH_FILES = $(BIN_DIST_TAR_BZ2)
 
 # Upload the distribution and documentation
 ifneq "$(ISCC)" ""
@@ -468,7 +460,7 @@ binary-dist::
 
 ifeq "$(darwin_TARGET_OS)" "1"
 
-.PHONY: framework-pkg, framework-binary-dist
+.PHONY: framework-pkg framework-binary-dist
 
 framework-pkg:
 	$(MAKE) -C distrib/MacOS framework-pkg