X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=ac674276640ec84582608b8b1139b00f64c7ddff;hp=445b008d87f2d220b99aa93e27323ef6573a301e;hb=34690bfd1e7a0e3a1cde6d688d4ba2e6f9170b69;hpb=7ef211e8d6aed14f77b344d976e207bc77e365a7

diff --git a/Makefile b/Makefile
index 445b008..ac67427 100644
--- a/Makefile
+++ b/Makefile
@@ -66,10 +66,10 @@ endif
 
 SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 
-# Sanity check that all the core libraries are in the tree, to catch
+# Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-	@for d in `cat libraries/core-packages`; do \
+	@for d in `cat libraries/boot-packages`; do \
 	  if test ! -d libraries/$$d; then \
 	     echo "Looks like you're missing libraries/$$d,"; \
 	     echo "maybe you haven't done './darcs-all get'?"; \
@@ -139,7 +139,7 @@ all :: stamp.inplace-gcc-lib
 stamp.inplace-gcc-lib:
 	$(RM) -r compiler/gcc-lib
 	mkdir compiler/gcc-lib
-	cp $(GccDir)ld.exe compiler/gcc-lib
+	cp $(LD) compiler/gcc-lib
 	touch $@
 
 clean ::
@@ -394,8 +394,8 @@ 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) )
+	( 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 >bin-manifest-$(ProjectVersion) )
 
 PUBLISH_FILES = $(BIN_DIST_TARBALL)
 
@@ -415,7 +415,7 @@ endif
 
 # Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-binary-dist :: publish-binary-dist
+publish :: publish-binary-dist
 endif
 
 .PHONY: publish-binary-dist
@@ -427,17 +427,23 @@ publish-binary-dist ::
 	    done \
 	done
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-# On Windows, we cannot use absoluate pathnames to rsync, because they look
-# like remote pathnames ("c:/foo/bar").  Also, the docs reside in doc/
-# rather than share/, due to prep-bin-dist-mingw.
-publish-binary-dist ::
-	$(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/doc/html/* $(PublishLocation)/docs
+# You need to first make binddisttest, and then run
+#     make publish 'prefix=$(BIN_DIST_INST_DIR)'
+# for this to find the right place.
+
+# We assume that Windows means Cygwin, as we can't just use docdir
+# unchanged or rsync (really SSH?) thinks that c:/foo means /foo on
+# the machine c.
+
+ifeq "$(Windows)" "YES"
+PUBLISH_DOCDIR = $(shell cygpath --unix $(docdir))
 else
-publish-binary-dist ::
-	$(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
+PUBLISH_DOCDIR = $(docdir)
 endif
 
+publish-binary-dist ::
+	$(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs
+
 binary-dist::
 	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
 
@@ -500,6 +506,7 @@ dist ::
 	  && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
 	  && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
 	  && $(MAKE) distclean \
+	  && $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ \
 	  && $(RM) -rf compiler/stage[123] mk/build.mk \
 	  && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
 	)
@@ -556,7 +563,7 @@ hc-file-bundle :
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
-	ghc.spec docs/users_guide/ug-book.xml
+	ghc.spec docs/users_guide/ug-book.xml extra-gcc-opts
 
 # don't clean config.mk: it's needed when cleaning stuff later on
 LATE_DIST_CLEAN_FILES += mk/config.mk 
@@ -569,6 +576,7 @@ extraclean::
 
 clean distclean ::
 	$(MAKE) -C bindisttest $@
+	if test -d testsuite; then $(MAKE) -C testsuite $@; fi
 
 # -----------------------------------------------------------------------------