X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=ec0c901bfe412c7441b192418ba534e4b70bbe06;hp=c81dc39847e6d7d0423364376f1fdc1976ccdf68;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=eb3de385e95923c0c391d7a19a1e8da7a2865c4a

diff --git a/Makefile b/Makefile
index c81dc39..ec0c901 100644
--- a/Makefile
+++ b/Makefile
@@ -59,17 +59,12 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_NOLIB = includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = includes rts compat compiler docs utils driver
 else
-SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = includes compat utils driver docs compiler rts
 endif
 
-SUBDIRS = $(SUBDIRS_NOLIB) libraries
-
-VERSION :
-	echo $(ProjectVersion) >VERSION
-
-all :: VERSION
+SUBDIRS_INSTALL = includes compat utils driver docs rts libraries compiler
 
 # Sanity check that all the core libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -77,15 +72,20 @@ 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
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(SUBDIRS_NOLIB); do \
+	for i in $(SUBDIRS_BUILD); do \
 	  echo "------------------------------------------------------------------------"; \
 	  echo "== $(MAKE) boot $(MFLAGS);"; \
 	  echo " in $(shell pwd)/$$i"; \
@@ -93,7 +93,7 @@ stage1 : check-packages
 	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) boot; \
 	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done; \
-	for i in $(SUBDIRS_NOLIB); do \
+	for i in $(SUBDIRS_BUILD); do \
 	  echo "------------------------------------------------------------------------"; \
 	  echo "== $(MAKE) all $(MFLAGS);"; \
 	  echo " in $(shell pwd)/$$i"; \
@@ -101,8 +101,8 @@ stage1 : check-packages
 	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
 	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
-	@$(MAKE) -C libraries boot
-	@$(MAKE) -C libraries all
+	$(MAKE) -C libraries boot
+	$(MAKE) -C libraries all
 
 stage2 : check-packages
 	$(MAKE) -C compiler boot stage=2
@@ -135,8 +135,9 @@ endif
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
+	$(INSTALL_DIR) $(bindir)
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(SUBDIRS); do \
+	for i in $(SUBDIRS_INSTALL); do \
 	  echo "------------------------------------------------------------------------"; \
 	  echo "== $(MAKE) $@ $(MFLAGS);"; \
 	  echo " in $(shell pwd)/$$i"; \
@@ -178,7 +179,7 @@ endif
 
 install-docs ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(SUBDIRS); do \
+	for i in $(SUBDIRS_INSTALL); do \
 	  echo "------------------------------------------------------------------------"; \
 	  echo "== $(MAKE) $@ $(MFLAGS);"; \
 	  echo " in $(shell pwd)/$$i"; \
@@ -210,105 +211,107 @@ install-docs ::
 #	binary-dist is a GHC addition for binary distributions
 # 
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs
-else
-BinDistShScripts =
-endif
+BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
 
-BinDistPrlScripts = ghcprof
-BinDistLibPrlScripts = ghc-asm ghc-split
-BinDistBins = hp2ps runghc
-BinDistOptBins = runhaskell
-BinDistLinks = ghc ghci ghc-pkg
-BinDistLibSplicedFiles = package.conf
-BinDistDirs = includes compiler docs driver libraries rts utils
+binary-dist::
+	-rm -rf $(BIN_DIST_DIR)
+	-$(RM) $(BIN_DIST_DIR).tar.gz
 
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
-BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
+binary-dist::
+	$(MAKE) prefix=$(BIN_DIST_DIR) install
+
+binary-dist::
+	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+
+else
+
+BinDistDirs = includes compiler docs rts
 
-BIN_DIST_TOP= distrib/Makefile-bin.in \
-	      distrib/configure-bin.ac \
-	      distrib/INSTALL \
-	      distrib/README \
-	      ANNOUNCE \
-	      LICENSE \
-	      utils/mkdirhier/mkdirhier \
-	      install-sh \
-	      config.guess \
-	      config.sub   \
-	      aclocal.m4
+BIN_DIST_TOP= distrib/Makefile \
+              distrib/configure-bin.ac \
+              distrib/INSTALL \
+              distrib/README \
+              ANNOUNCE \
+              LICENSE \
+              install-sh \
+              config.guess \
+              config.sub   \
+              aclocal.m4
 
 ifeq "$(darwin_TARGET_OS)" "1"
 BIN_DIST_TOP+=mk/fix_install_names.sh
 endif
 
-.PHONY: binary-dist-pre binary-dist binary-pack
+.PHONY: binary-dist-pre% binary-dist binary-pack
 
 binary-dist:: binary-dist-pre
 
 binary-dist-pre::
-ifeq "$(BIN_DIST)" ""
-	@echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk" && exit 1
-endif
-	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
-	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
-	@for i in $(BinDistDirs); do 		 	 \
-	  if test -d "$$i"; then 			 \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
-	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	   echo $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	   $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	  fi; \
-	done
+	$(MKDIRHIER) $(BIN_DIST_DIR)/mk
+	echo 'include $$(TOP)/Makefile-vars' >  $(BIN_DIST_DIR)/mk/boilerplate.mk
+	echo 'include $$(TOP)/mk/install.mk' >  $(BIN_DIST_DIR)/mk/target.mk
+	echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_DIR)/mk/target.mk
+	echo ''                              >  $(BIN_DIST_DIR)/mk/compat.mk
+	cp mk/package.mk $(BIN_DIST_DIR)/mk/
+	cp mk/install.mk $(BIN_DIST_DIR)/mk/
+	cp mk/recurse.mk $(BIN_DIST_DIR)/mk/
+	$(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)
+	$(MKDIRHIER) $(BIN_DIST_DIR)/share
+
+binary-dist::
+	$(MAKE) -C includes binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C compiler binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
+	# XXX $(MAKE) -C docs     binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C rts      binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C driver   binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C utils    binary-dist DOING_BIN_DIST=YES
+
+VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
 
 binary-dist::
 	@for i in $(BIN_DIST_TOP); do \
 	  if test -f "$$i"; then \
-	     echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
-	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+	     echo cp $$i $(BIN_DIST_DIR); \
+	     cp $$i $(BIN_DIST_DIR); \
 	  fi; \
 	done;
 	@echo "Configuring the Makefile for this project..."
-	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "package = ghc" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_BINS = $(BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_OPT_BINS = $(BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LINKS = $(BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo                                                         >  $(VARFILE)
+	echo "package = ghc"                                         >> $(VARFILE)
+	echo "version = $(ProjectVersion)"                           >> $(VARFILE)
+	echo "ProjectVersion = $(ProjectVersion)"                    >> $(VARFILE)
+	echo "HaveLibGmp = $(HaveLibGmp)"                            >> $(VARFILE)
+	echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"                  >> $(VARFILE)
+	echo "GhcWithInterpreter = $(GhcWithInterpreter)"            >> $(VARFILE)
+	echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
+	echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
+	cat distrib/Makefile-bin-vars.in                             >> $(VARFILE)
 	@echo "Generating a shippable configure script.."
-	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac
-	( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
+	$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
+	( cd $(BIN_DIST_DIR); autoreconf )
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+binary-dist::
+	$(MKDIRHIER) $(BIN_DIST_DIR)/icons
+	cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
+endif
+
 #
 # binary dist'ing the documentation.  
 # The default documentation to build/install is given below; overrideable
 # via build.mk or the 'make' command-line.
+#
+# If BINDIST_DOC_WAYS is set, use that
+# If XMLDocWays is set, use that
+# Otherwise, figure out what we can build based on configure results
 
 ifndef BINDIST_DOC_WAYS
 
+ifneq "$(XMLDocWays)" ""
+BINDIST_DOC_WAYS = $(XMLDocWays)
+else
 ifneq "$(XSLTPROC)" ""
 BINDIST_DOC_WAYS = html
 ifneq "$(FOP)" ""
@@ -324,73 +327,84 @@ endif # DVIPS
 endif # XMLTEX
 endif # FOP
 endif # XSLTPROC
+endif # XMLDocWays
 
 endif # BINDIST_DOC_WAYS
 
-binary-dist ::
 ifneq "$(DIR_DOCBOOK_XSL)" ""
-	@for i in $(BinDistDirs); do 		 	 	\
-	  if test -d "$$i"; then 			 	\
-	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
-	    echo $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	    $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \
-		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
-		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
-		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
-		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	  fi \
-	done
+.PHONY: binary-dist-doc-%
+
+BINARY_DIST_DOC_RULES=$(foreach d,$(BinDistDirs),binary-dist-doc-$d)
+
+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) \
+	        bindir=$(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) \
+	        libdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
+	        libexecdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
+	        datadir=$(BIN_DIST_DIR)/share
 endif
 
-# Rename scripts to $i.prl and $i.sh where necessary.
-# ToDo: do this in a cleaner way...
-
-ifneq "$(BinDistPrlScripts)" ""
-binary-dist::
-	@for i in $(BinDistPrlScripts); do \
-	     echo "Renaming $$i to $$i.prl"; \
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \
-	done
-endif
+.PHONY: binary-dist-doc-%
 
-ifneq "$(BinDistLibPrlScripts)" ""
 binary-dist::
-	@for i in $(BinDistLibPrlScripts); do \
-	     echo "Renaming $$i to $$i.prl"; \
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \
-	done
-endif
+	$(MAKE) -C libraries binary-dist
 
-ifneq "$(BinDistShScripts)" ""
-binary-dist::
-	@for i in $(BinDistShScripts); do \
-	    if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \
-	    	echo "Renaming $$i to $$i.sh"; \
-	    	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
-	    fi \
-	done
 endif
 
 # Tar up the distribution and build a manifest
-binary-dist ::
-	( cd $(BIN_DIST_TMPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
-	( cd $(BIN_DIST_TMPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+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) )
+
+PUBLISH_FILES = $(BIN_DIST_TARBALL)
+
+# Upload the distribution and documentation
+ifneq "$(ISCC)" ""
+WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-$(TARGETPLATFORM)
+WINDOWS_INSTALLER = $(WINDOWS_INSTALLER)$(exeext)
 
-# Upload the distribution
+PUBLISH_FILES += $(WINDOWS_INSTALLER)
+
+binary-dist :: generate-windows-installer
+
+.PHONY: generate-windows-installer
+generate-windows-installer ::
+	$(SED) "s/@VERSION@/$(ProjectVersion)/" distrib/ghc.iss | $(ISCC) /O. /F$(WINDOWS_INSTALLER_BASE) -
+endif
+
+# Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-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\
+binary-dist :: publish-binary-dist
+endif
+
+.PHONY: publish-binary-dist
+publish-binary-dist ::
+	@for f in $(PUBLISH_FILES); do \
+	    for i in 0 1 2 3 4 5 6 7 8 9; do \
+	        echo "Try $$i: $(PublishCp) $$f $(PublishLocation)/dist"; \
+	        if $(PublishCp) $$f $(PublishLocation)/dist; then break; fi; \
+	    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
+else
+publish-binary-dist ::
+	$(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
 endif
 
 binary-dist::
@@ -418,7 +432,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS_INSTALL))
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
@@ -442,6 +456,11 @@ EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/ext
 SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
 SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
 
+VERSION :
+	echo $(ProjectVersion) >VERSION
+
+dist :: VERSION
+
 dist ::
 	$(RM) -rf $(SRC_DIST_DIR)
 	$(RM) $(SRC_DIST_NAME).tar.gz
@@ -463,12 +482,12 @@ dist ::
 ifneq "$(PublishLocation)" ""
 dist ::
 	@for i in 0 1 2 3 4 5 6 7 8 9; do \
-		echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)"; \
-		if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation); then break; fi\
+		echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
+		if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\
 	done
 	@for i in 0 1 2 3 4 5 6 7 8 9; do \
-		echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)"; \
-		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation); then break; fi\
+		echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
+		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
 	done
 endif