make this build with GHC 6.7+

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 02d43d9..75106d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,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
@@ -137,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
@@ -381,6 +382,7 @@ endif
        echo "XSLTPROC = $(XSLTPROC)"                     >> $(BIN_DIST_VARFILE)
        echo "TARGETPLATFORM = $(TARGETPLATFORM)"         >> $(BIN_DIST_VARFILE)
        echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"             >> $(BIN_DIST_VARFILE)
+       echo "LATEX_DOCS = $(LATEX_DOCS)"                 >> $(BIN_DIST_VARFILE)
        echo "INTEGER_LIBRARY = $(INTEGER_LIBRARY)"       >> $(BIN_DIST_VARFILE)
        cat distrib/Makefile-bin-vars.in                  >> $(BIN_DIST_VARFILE)
 
@@ -459,7 +461,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