X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=870e0c4dc6f134d9a1a8b282141aa917ea6f50a3;hp=4f900d50c950443bb196422e46562607aee16161;hb=9dbd1897ed02a3bdbeee41c0164b88569a053ff8;hpb=bc0eeca8c0e49ff50d5a2d154e486009aae97187

diff --git a/Makefile b/Makefile
index 4f900d5..870e0c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,93 +1,146 @@
 ############################################################################
 #
-#			fptools/Makefile
+#		This is the top-level Makefile for GHC
 #
-#		This is the main Makefile for fptools.
+# Targets: 
+#
+# 	bootstrap (DEFAULT)
+#		Builds GHC, then builds the libraries,
+#		then uses this GHC ("stage 1") to build itself
+#		("stage 2").
+#
+#	bootstrap2
+#		Same as bootstrap
+#
+#	bootstrap3
+#		bootstrap2 + we build GHC one more time ("stage 3")
+#
+#	stage1
+#		Just build up to stage 1
+#
+#	stage2
+#		Just build stage 2 (stage 1 must be built)
+#
+#	stage3
+#		Just build stage 3 (stage 2 must be built)
+#
+#	all
+#		Same as bootstrap
+#
+#       install
+#		Install everything, including stage 2 compiler by default
+#		(override with stage=3, for example).
+#
+#	dist
+#		Make a source dist (WARNING: runs 'make distclean' first)
+#
+#	binary-dist
+#		Builds a binary distribution
+#
+#	framework-pkg  [MacOS only]
+#		Builds /Library/Frameworks/GHC.framework wrapped into a Mac
+#		installer package
+#
+#	framework-binary-dist  [MacOS only]
+#		Builds GHC.framework encapsulating a binary distribution
+#		(to give a relocatable framework)
+#
+#	hc-file-bundle
+#		Builds an HC-file bundle, for bootstrapping
+#
+#	clean, distclean, maintainer-clean
+#		Increasing levels of cleanliness
 #
 ############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-# find the projects that actually exist...
-ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+#
+# Order is important! It's e.g. necessary to descend into include/
+# before the rest to have a config.h, etc.
+#
+# If we're booting from .hc files, swap the order
+# we descend into subdirs - to boot utils must be before driver.
+#
+.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
 
-# and filter only those that the user requested, if necessary
-ifeq "$(ProjectsToBuild)" ""
-SUBDIRS = $(ProjectsThatExist)
+# We can't 'make boot' in libraries until stage1 is built
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
 else
-SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
+SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-ifneq "$(Project)" ""
-   ifeq "$(Project)" "GreenCard"
-       ProjectDirectory=greencard
-   else
-	ifeq "$(Project)" "HaskellDirect"
-		ProjectDirectory=hdirect
-	else
-		ProjectDirectory=$(Project)
-	endif
-   endif
-   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
-   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/version.mk
-endif
-
-# -----------------------------------------------------------------------------
-# Certain targets require that Project is set from the command line.
-
-CURRENT_TARGET = $(MAKECMDGOALS)
-project-check :
-	@if [ "$(Project)" = "" ]; then \
-		echo "	You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
-		echo "	eg. make $(CURRENT_TARGET) Project=Ghc"; \
-		exit 1; \
+SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+
+# Sanity check that all the boot libraries are in the tree, to catch
+# failure to run darcs-all.
+check-packages :
+	@ds=`cat libraries/boot-packages`;\
+	for d in $$ds; do \
+	  if test ! -d libraries/$$d; then \
+	     echo "Looks like you're missing libraries/$$d,"; \
+	     echo "maybe you haven't done './darcs-all get'?"; \
+	     exit 1; \
+	  fi \
+	done
+	@if test ! -f 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
 
-# -----------------------------------------------------------------------------
-# Targets: all, stage1, stage2, stage3
-
-DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h
-
-extraclean::
-	$(RM) -rf autom4te.cache
-
-#
-# If you've ended up using an in-place version of Happy,
-# make sure it gets built early on.
-#
-ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
-build :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
-
-$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
-	$(MAKE) -C happy boot all
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+GCC_LIB_DEP = stamp.inplace-gcc-lib
+endif
 endif
 
-# Build all projects that we know about
-build ::
+stage1 : $(GCC_LIB_DEP) check-packages
+	$(MAKE) -C utils mostlyclean
+	$(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); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i boot; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      $(MAKE) -C $$i all; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS_BUILD); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) boot $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(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_BUILD); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) all $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
-
-ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
-
-.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
-
-stage1 : build
-
-stage2 :
-	$(MAKE) -C ghc/compiler boot stage=2
-	$(MAKE) -C ghc/compiler stage=2
-
-stage3 :
-	$(MAKE) -C ghc/compiler boot stage=3
-	$(MAKE) -C ghc/compiler stage=3
+	$(MAKE) -C libraries boot
+	$(MAKE) -C libraries all
+
+# When making distributions (i.e., whether with binary-dist or using the 
+# vanilla install target to create an installer package), we can have problems
+# if some things (e.g. ghc-pkg) are compiled with the bootstrapping compiler 
+# and some (e.g. the stage 2 compiler) with the stage1 compiler. See #1860 for
+# an example.  Thus, we explicitly build a second version with the stage 1 
+# compiler of all utils that get installed and of all extra support binaries
+# includes in binary dists.
+stage2 : check-packages
+	$(MAKE) -C utils mostlyclean
+	$(MAKE) -C utils stage=2
+	$(MAKE) -C compiler boot stage=2
+	$(MAKE) -C compiler stage=2
+	$(RM) -f libraries/ifBuildable/ifBuildable
+	$(MAKE) -C libraries stage=2 ifBuildable/ifBuildable
+	$(RM) -f libraries/installPackage/installPackage
+	$(MAKE) -C libraries stage=2 installPackage/installPackage
+
+
+stage3 : check-packages
+	$(MAKE) -C compiler boot stage=3
+	$(MAKE) -C compiler stage=3
 
 bootstrap  : bootstrap2
 
@@ -97,8 +150,33 @@ bootstrap2 : stage1
 bootstrap3 : bootstrap2
 	$(MAKE) stage3
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+all :: stamp.inplace-gcc-lib
+
+.PHONY: stamp.inplace-gcc-lib
+
+# This is a hack to make Cabal able to find ld when we run tests with
+# the inplace ghc. We should probably install all the gcc stuff in our
+# tree somewhere, and then have install copy it from there rather than
+# from the filesystem.
+stamp.inplace-gcc-lib:
+	$(RM) -r compiler/gcc-lib
+	mkdir compiler/gcc-lib
+	cp $(LD) compiler/gcc-lib
+	touch $@
+
+clean ::
+	$(RM) -r compiler/gcc-lib
+	$(RM) -f inplace-gcc-lib
+endif
+endif
+
 all :: bootstrap
 
+# -----------------------------------------------------------------------------
+# Installing
+
 # We want to install the stage 2 bootstrapped compiler by default, but we let
 # the user override this by saying 'make install stage=1', for example.
 ifeq "$(stage)" ""
@@ -107,27 +185,28 @@ else
 INSTALL_STAGE =
 endif
 
-else # Not building GHC
-
-all :: build
-
-INSTALL_STAGE =
-
-endif
-
-boot ::
-	@echo "Please use \`make all' only from the top-level, or \`make boot' followed"
-	@echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install ::
+# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
+install :: check-packages
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i $(INSTALL_STAGE) install; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) $@ $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# These files need to be in the InstallShield
+# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
+# in the top-level directory of the distribution
+INSTALL_DATAS += ANNOUNCE LICENSE README
+endif
+
 # If installing on Windows with MinGW32, copy the gcc compiler, headers and libs
 # and the perl interpreter and dll into the GHC prefix directory.
 # Gcc and Perl source locations derived from configuration data.
@@ -139,6 +218,8 @@ install ::
 	-mkdir $(prefix)/include/mingw
 	-cp -rp $(GccDir)../include/* $(prefix)/include/mingw
 	-cp -rp $(GccDir)../lib/gcc-lib/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+	-cp -rp $(GccDir)../lib/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+	-cp -rp $(GccDir)../libexec/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
 	-cp $(GccDir)../lib/*.* $(prefix)/gcc-lib
 	-cp $(GccDir)gcc.exe $(prefix)
 	-cp $(GccDir)as.exe $(prefix)/gcc-lib
@@ -150,21 +231,25 @@ install ::
 endif
 endif
 
+# Install gcc-extra-opts
+install ::
+	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(DESTDIR)$(libdir)
+
 install-docs ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i $(INSTALL_STAGE) install-docs; \
-	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-	      fi; \
+	for i in $(SUBDIRS); do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "== $(MAKE) $@ $(MFLAGS);"; \
+	  echo " in $(shell pwd)/$$i"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
 
 # -----------------------------------------------------------------------------
 # Making a binary distribution
 #
-# To make a particular binary distribution: 
-# set $(Project) to the name of the project, capitalised (eg. Ghc or Happy).
-
 # `dist' `binary-dist'
 #      Create a distribution tar file for this program. The tar file
 #      should be set up so that the file names in the tar file start with
@@ -182,195 +267,194 @@ install-docs ::
 #      that are in the distribution, to make sure they are up to date in
 #      the distribution. See Making Releases.
 #
-#	binary-dist is an FPtools addition for binary distributions
+#	binary-dist is a GHC addition for binary distributions
 # 
 
-binary-dist :: project-check
+binary-dist::
+	-rm -rf $(BIN_DIST_DIR)
+	-$(RM) $(BIN_DIST_TARBALL)
 
-BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
-#
-# list of toplevel directories to include in binary distrib.
-#
-BIN_DIST_MAIN_DIR=$($(Project)MainDir)
-BIN_DIST_DIRS=$($(Project)BinDistDirs)
+binary-dist::
+	$(MAKE) prefix=$(BIN_DIST_DIR) install
+	$(MAKE) prefix=$(BIN_DIST_DIR) install-docs
 
-binary-dist:: binary-dist-pre
+binary-dist::
+	cd $(BIN_DIST_DIR) && $(SHELL) ../distrib/prep-bin-dist-mingw
 
-BIN_DIST_TOP= distrib/Makefile-bin.in \
-	      distrib/configure-bin.ac \
-	      distrib/INSTALL \
-	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
-	      $(BIN_DIST_MAIN_DIR)/VERSION \
-	      $(BIN_DIST_MAIN_DIR)/LICENSE \
-	      $(BIN_DIST_MAIN_DIR)/README \
-	      glafp-utils/mkdirhier/mkdirhier \
-	      install-sh \
-	      config.guess \
-	      config.sub   \
-	      aclocal.m4
+binary-dist::
+	$(MKDIRHIER) $(BIN_DIST_DIR)/icons
+	cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
 
-#
-# binary-dist creates a binary bundle, set BIN_DIST_NAME
-# to package name and do `make binary-dist Project=<project-name>'
-# (normally this just a thing you would do from the toplevel of fptools)
-#
-.PHONY: binary-dist-pre binary-dist binary-pack
+else
+
+BinDistDirs = includes compiler docs rts
+
+BIN_DIST_TOP= distrib/Makefile \
+              distrib/configure-bin.ac \
+              distrib/INSTALL \
+              distrib/README \
+              ANNOUNCE \
+              LICENSE \
+              install-sh \
+              extra-gcc-opts.in \
+              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
 
-BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
-BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+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 your build.mk" && exit 1
-endif
-	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
-	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
-	-echo "BIN_DIST_DIRS = $(BIN_DIST_DIRS)"
-	@for i in $(BIN_DIST_DIRS); 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/package.mk' >  $(BIN_DIST_DIR)/mk/target.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/
+	cp mk/fptools.css $(BIN_DIST_DIR)/mk/
+	$(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)
+	$(MKDIRHIER) $(BIN_DIST_DIR)/share
+
+binary-dist::
+	$(MAKE) -C gmp       binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C includes  binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C compiler  binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
+	$(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
+	$(MAKE) -C docs      binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C libraries binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C libraries/Cabal/doc 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 = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LIB_SPLICED_FILES = $($(Project)BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_OPT_BINS = $($(Project)BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-	echo "PACKAGE_LINKS = $($(Project)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 "GhcHasEditline = $(GhcHasEditline)"                    >> $(VARFILE)
+	echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
+	echo "XMLDocWays = $(XMLDocWays)"                            >> $(VARFILE)
+	# We won't actually use xsltproc, but we need to know if it's "" or not
+	echo "XSLTPROC = $(XSLTPROC)"                                >> $(VARFILE)
+	echo "TARGETPLATFORM = $(TARGETPLATFORM)"                    >> $(VARFILE)
+	echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"                        >> $(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 )
-	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
-		cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
-			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
-	fi
-	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
-		cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
-			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
-	fi
-#
-# binary dist'ing the documentation.  
-# Which documentation to build/install is hardcoded below.
-#
-
-BINDIST_DOC_WAYS = html ps
-# BINDIST_DOC_WAYS =
-
-binary-dist ::
-ifneq "$(DIR_DOCBOOK_XSL)" ""
-	@for i in $(BIN_DIST_DIRS); 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
+	$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
+	( cd $(BIN_DIST_DIR); autoreconf )
 endif
 
-# Rename scripts to $i.prl and $i.sh where necessary.
-# ToDo: do this in a cleaner way...
+# Tar up the distribution and build a manifest
+binary-dist :: tar-binary-dist
 
-ifneq "$($(Project)BinDistPrlScripts)" ""
-binary-dist::
-	@for i in $($(Project)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
+.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) )
+
+PUBLISH_FILES = $(BIN_DIST_TARBALL)
+
+# Upload the distribution and documentation
+ifneq "$(ISCC)" ""
+WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-$(TARGETPLATFORM)
+WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
+
+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
 
-ifneq "$($(Project)BinDistLibPrlScripts)" ""
-binary-dist::
-	@for i in $($(Project)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
+# Upload the distribution and documentation
+ifneq "$(PublishLocation)" ""
+publish ::
+	make publish-binary-dist 'prefix=$(BIN_DIST_INST_DIR)'
 endif
 
-ifneq "$($(Project)BinDistShScripts)" ""
-binary-dist::
-	@for i in $($(Project)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 \
+nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
+
+.PHONY: publish-binary-dist
+publish-binary-dist ::
+	@for f in $(PUBLISH_FILES); \
+	    do $(call nTimes,10,$(PublishCp) $$f $(PublishLocation)/dist); \
 	done
-endif
 
-#
-# Do this separately for now
-# 
-binary-pack::
-	( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) )
-
-ifneq "$(way)" ""
-.PHONY: package-way-dist
-package-way-dist::
-	( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
-	gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
-endif
+# You need to "make binddisttest" before publishing the docs, as it
+# works by publish setting $(prefix) to inside the binddisttest
+# directory so $(docdir) points to the right place.
 
-ifneq "$(way)" ""
-remove-way-dist::
-	( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec $(RM) {} \; )
+# 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_DOCDIR = $(docdir)
 endif
 
+publish-binary-dist ::
+	$(call nTimes,10,$(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!"
 
 # -----------------------------------------------------------------------------
+# Building MacOS installer packages
+#
+# 'framework-pkg'
+#	Create an installer package for /Library/Frameworks/GHC.framework
+#
+# 'framework-binary-dist'
+#	Create an installer package for GHC.framework encapsulating a
+#	binary-dist to make it relocatable
+#	FIXME: This is only partially implemented so far
+
+ifeq "$(darwin_TARGET_OS)" "1"
+
+.PHONY: framework-pkg, framework-binary-dist
+
+framework-pkg:
+	$(MAKE) -C distrib/MacOS framework-pkg
+
+framework-binary-dist:
+	$(MAKE) -C distrib/MacOS framework-binary-dist
+
+endif
+
+# -----------------------------------------------------------------------------
 # Building source distributions
 #
 # Do it like this: 
 #
 #	$ make
-#	$ make dist Project=Ghc
+#	$ make dist
 #
 # WARNING: `make dist' calls `make distclean' before tarring up the tree.
 #
@@ -380,82 +464,121 @@ binary-dist::
 #
 # Directory in which we're going to build the src dist
 #
+SRC_DIST_NAME=ghc-$(ProjectVersion)
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib libraries/Cabal/doc,$(SUBDIRS))
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
-	aclocal.m4 README Makefile install-sh \
-	mk/bootstrap.mk \
-	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \
-	mk/fptools.css mk/fix_install_names.sh
+	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
+	ghc.spec.in extra-gcc-opts.in VERSION boot
 
-dist dist-manifest dist-package :: project-check
-
-# clean the tree first, leaving certain extra files in place (eg. configure)
-dist :: distclean
-
-dist ::
-	-rm -rf $(SRC_DIST_DIR)
-	-$(RM) $(SRC_DIST_NAME).tar.gz
-	mkdir $(SRC_DIST_DIR)
-	mkdir $(SRC_DIST_DIR)/mk
-	$(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh
-	$(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh
+# -----------------------------------------------------------------------------
+# Source distributions
 
-# Automatic generation of a MANIFEST file for a source distribution
-# tree that is ready to go.
-dist-manifest ::
-	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST
+# A source dist is built from a complete build tree, because we
+# require some extra files not contained in a darcs checkout: the
+# output from Happy and Alex, for example.
+# 
+# The steps performed by 'make dist' are as follows:
+#   - create a complete link-tree of the current build tree in /tmp
+#   - run 'make distclean' on that tree
+#   - remove a bunch of other files that we know shouldn't be in the dist
+#   - tar up first the extralibs package, then the main source package
 
-dist-package :: dist-package-tar-gz
+EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages))
 
-SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS))
+SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
+SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
 
-dist-package-tar-bz2 ::
-	BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2
+VERSION :
+	echo $(ProjectVersion) >VERSION
 
-dist-package-tar-gz ::
-	$(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz
+dist :: VERSION
 
-dist-package-zip ::
-	cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \
-	       $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME)-src.zip $(SRC_DIST_PATHS)
+dist ::
+	$(RM) -rf $(SRC_DIST_DIR)
+	$(RM) $(SRC_DIST_NAME).tar.gz
+	mkdir $(SRC_DIST_DIR)
+	( cd $(SRC_DIST_DIR) \
+	  && 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 \
+	  && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \
+	  && $(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 \
+	)
+	tar chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL)
+	$(RM) -rf $(EXTRA_LIBS)
+	tar chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL)
+
+# Upload the distribution(s)
+# Retrying is to work around buggy firewalls that corrupt large file transfers
+# over SSH.
+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)/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)/dist"; \
+		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
+	done
+endif
 
 # -----------------------------------------------------------------------------
 # HC file bundles
 
-hc-file-bundle : project-check
-	$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
-	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
-	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
-	     $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
+hc-file-bundle :
+	$(RM) -r ghc-$(ProjectVersion)
+	$(LN_S) . ghc-$(ProjectVersion)
+	$(FIND) ghc-$(ProjectVersion)/compiler \
+	     ghc-$(ProjectVersion)/utils \
+	     ghc-$(ProjectVersion)/compat \
+	     ghc-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
+	for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
 	     if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
-	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/rts -name "*.cmm" -follow -print` ""; do \
+	for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \
 	     if test "x$$f" != "x"; then \
 	        echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
-	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
-	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+	echo ghc-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
+	echo ghc-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go
+	echo ghc-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go
+	echo ghc-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go
+	echo ghc-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
+	tar czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+
+# -----------------------------------------------------------------------------
+# Cleaning
 
 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 extra-gcc-opts
+
+# don't clean config.mk: it's needed when cleaning stuff later on
+LATE_DIST_CLEAN_FILES += mk/config.mk 
+
+# VERSION is shipped in a source dist
+MAINTAINER_CLEAN_FILES += VERSION
+
+extraclean::
+	$(RM) -rf autom4te.cache
+
+clean distclean ::
+	$(MAKE) -C bindisttest $@
+	if test -d testsuite; then $(MAKE) -C testsuite $@; fi
+
 # -----------------------------------------------------------------------------
 
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.