White space only
[ghc-hetmet.git] / ghc.mk
diff --git a/ghc.mk b/ghc.mk
index 8fb95d0..6df7220 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -155,7 +155,7 @@ include rules/clean-target.mk
 # -----------------------------------------------------------------------------
 # The inplace tree
 
-$(eval $(call clean-target,inplace,,inplace))
+$(eval $(call clean-target,inplace,,inplace/bin inplace/lib))
 
 # -----------------------------------------------------------------------------
 # Whether to build dependencies or not
@@ -285,17 +285,24 @@ include rules/bindist.mk
 # Packages
 
 # --------------------------------
-# Subsets of packages
+# Properties of packages
+# These lists say "if this package is built, here's a property it has"
+# They do not say "this package will be built"; see $(PACKAGES_xx) for that
 
 # Packages that are built but not installed
 INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
 
+DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
+                dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
+                vector primitive
+
 # Packages that, if present, must be built by the stage2 compiler,
 # because they use TH and/or annotations, or depend on other stage2
-# packages.
-STAGE2_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
-                  dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
-                  vector
+# packages:
+STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random
+# Packages that we shouldn't build if we don't have TH (e.g. because
+# we're building a profiled compiler):
+TH_PACKAGES := $(DPH_PACKAGES)
 
 # Packages that are built by stage0, in addition to stage1.  These
 # packages are dependencies of GHC, that we do not assume the stage0
@@ -305,11 +312,24 @@ STAGE2_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
 # so we don't have to include it below.
 STAGE0_PACKAGES = Cabal hpc extensible-exceptions binary bin-package-db
 
-# --------------------------------
-# Building the lists of packages
+# These packages are installed, but are installed hidden
+# Why install them at all?  Because the 'ghc' package depends on them
+HIDDEN_PACKAGES = binary
 
-# We need to build two lists:
-# 
+# $(EXTRA_PACKAGES)  is another classification, of packages built but
+#                    not installed
+#                    It is set in rules/extra-package.mk, 
+#                    by $(call extra-packages) a little further down 
+#                    this ghc.mk 
+
+
+# --------------------------------
+# Packages to build
+# The lists of packages that we *actually* going to build in each stage:
+#
+#  $(STAGE0_PACKAGE)   does double duty; it really is the list of packages
+#                      we build the bootstrap compiler in stage 0
+#
 #  $(PACKAGES)          A list of directories relative to libraries/ containing
 #                       packages that will be built by stage1, in dependency
 #                       order.
@@ -333,11 +353,13 @@ define addPackageGeneral
 endef
 
 define addPackage # args: $1 = package, $2 = condition
+ifneq "$(filter $1,$(TH_PACKAGES)) $(GhcProfiled)" "$1 YES"
 ifeq "$(filter $1,$(STAGE2_PACKAGES))" "$1"
 $(call addPackageGeneral,PACKAGES_STAGE2,$1,$2)
 else
 $(call addPackageGeneral,PACKAGES,$1,$2)
 endif
+endif
 endef
 
 $(eval $(call addPackage,ghc-prim))
@@ -413,10 +435,13 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk
 # package-data.mk is sufficient, as that in turn depends on all the
 # libraries
 utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
+utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk
+utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk
 
 utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk
+utils/runghc/dist/package-data.mk: compiler/stage2/package-data.mk
 
 # add the final two package.conf dependencies: ghc-prim depends on RTS,
 # and RTS depends on libffi.
@@ -435,9 +460,6 @@ ifeq "$(BuildSharedLibs)" "YES"
 ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB))
 endif
 BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
-# A useful pseudo-target
-.PHONY: stage1_libs
-stage1_libs : $(ALL_STAGE1_LIBS)
 
 OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
 ifeq "$(BuildSharedLibs)" "YES"
@@ -485,6 +507,23 @@ $(error Unknown integer library: $(INTEGER_LIBRARY))
 endif
 endif
 
+# ----------------------------------------------
+# Checking packages with 'cabal check'
+
+ifeq "$(CHECK_PACKAGES)" "YES"
+all: check_packages
+endif
+
+# These packages don't pass the Cabal checks because hs-source-dirs
+# points outside the source directory. This isn't a real problem in
+# these cases, so we just skip checking them.
+# NB. these must come before we include the ghc.mk files below, because
+# they disable the relevant rules.
+CHECKED_libraries/dph/dph-seq = YES
+CHECKED_libraries/dph/dph-par = YES
+# In compiler's case, include-dirs points outside of the source tree
+CHECKED_compiler = YES
+
 # -----------------------------------------------------------------------------
 # Include build instructions from all subdirs
 
@@ -531,7 +570,6 @@ BUILD_DIRS += \
    docs/users_guide \
    docs/ext-core \
    docs/man \
-   libraries/Cabal/doc \
    $(GHC_UNLIT_DIR) \
    $(GHC_HP2PS_DIR)
 
@@ -558,14 +596,9 @@ BUILD_DIRS += \
 ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += \
    bindisttest \
-   $(GHC_CABAL_DIR) \
    $(GHC_GENAPPLY_DIR)
 endif
 
-BUILD_DIRS += \
-   utils/haddock \
-   utils/haddock/doc
-
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
    $(patsubst %, libraries/%, $(PACKAGES))
@@ -576,11 +609,16 @@ BUILD_DIRS += libraries/integer-gmp/gmp
 endif
 
 BUILD_DIRS += \
+   utils/haddock \
+   utils/haddock/doc \
    compiler \
    $(GHC_HSC2HS_DIR) \
    $(GHC_PKG_DIR) \
    utils/testremove \
    utils/ghctags \
+   utils/ghc-pwd \
+   utils/dummy-ghc \
+   $(GHC_CABAL_DIR) \
    utils/hpc \
    utils/runghc \
    ghc
@@ -627,7 +665,9 @@ utils/runghc_dist_DISABLE = YES
 utils/ghctags_dist_DISABLE = YES
 utils/hpc_dist_DISABLE = YES
 utils/hsc2hs_dist-install_DISABLE = YES
+utils/ghc-cabal_dist-install_DISABLE = YES
 utils/ghc-pkg_dist-install_DISABLE = YES
+utils/ghc-pwd_dist_DISABLE = YES
 utils/mkUserGuidePart_dist_DISABLE = YES
 utils/compare_sizes_dist_DISABLE = YES
 compiler_stage2_DISABLE = YES
@@ -640,6 +680,11 @@ endif
 
 include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 
+# A useful pseudo-target (must be after the include above, because it needs
+# the value of things like $(libraries/base_dist-install_v_LIB).
+.PHONY: stage1_libs
+stage1_libs : $(ALL_STAGE1_LIBS)
+
 # ----------------------------------------------
 # Per-package compiler flags
 # 
@@ -655,21 +700,6 @@ $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-instal
 # Add $(GhcBootLibHcOpts) to all stage0 package builds
 $(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts)))
 
-# ----------------------------------------------
-# Checking packages with 'cabal check'
-
-ifeq "$(CHECK_PACKAGES)" "YES"
-all: check_packages
-endif
-
-# These packages don't pass the Cabal checks because hs-source-dirs
-# points outside the source directory. This isn't a real problem in
-# these cases, so we just skip checking them.
-CHECKED_libraries/dph/dph-seq = YES
-CHECKED_libraries/dph/dph-par = YES
-# In compiler's case, include-dirs points outside of the source tree
-CHECKED_compiler = YES
-
 # -----------------------------------------------
 # Haddock-related bits
 
@@ -750,6 +780,17 @@ ifeq "$(UseArchivesForGhci)" "NO"
 ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS)
 endif
 
+ifeq "$(UseArchivesForGhci)" "YES"
+GHCI_lib_way = v
+else
+GHCI_lib_way = GHCI
+endif
+
+# Deps for TH uses in libraries
+$(foreach way, $(GhcLibWays),$(eval \
+libraries/vector/dist-install/build/Data/Vector/Fusion/Stream/Monadic.$($(way)_osuf): \
+    $(libraries/primitive_dist-install_$(GHCI_lib_way)_LIB) \
+  ))
 endif
 
 # -----------------------------------------------------------------------------
@@ -771,8 +812,7 @@ endif # Windows
 
 ifneq "$(BINDIST)" "YES"
 $(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \
-    libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \
-    libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs
+    libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs
 endif # BINDIST
 
 libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
@@ -780,11 +820,6 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
                           | $$(dir $$@)/.
        "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@
 
-libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
-                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \
-                          | $$(dir $$@)/.
-       "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@
-
 .PHONY: tags
 tags: tags_compiler
 
@@ -801,26 +836,26 @@ install: install_docs
 endif
 
 install_bins: $(INSTALL_BINS)
-       $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
        for i in $(INSTALL_BINS); do \
-               $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ;  \
+               $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(bindir)") ;  \
        done
 
 install_libs: $(INSTALL_LIBS)
-       $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(ghclibdir)")
        for i in $(INSTALL_LIBS); do \
                case $$i in \
                  *.a) \
-                   $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
+                   $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \
                    $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \
                  *.dll) \
-                   $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \
+                   $(call INSTALL_DATA,-s $(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \
                  *.so) \
-                   $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \
+                   $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \
                  *.dylib) \
-                   $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \
+                   $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)");; \
                  *) \
-                   $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \
+                   $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \
                esac; \
        done
 
@@ -828,9 +863,9 @@ install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
 ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
        @:
 else
-       $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)")
        for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
-               $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \
+               $(call INSTALL_SCRIPT,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibexecdir)"); \
        done
 endif
 
@@ -838,9 +873,9 @@ install_libexecs:  $(INSTALL_LIBEXECS)
 ifeq "$(INSTALL_LIBEXECS)" ""
        @:
 else
-       $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)")
        for i in $(INSTALL_LIBEXECS); do \
-               $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \
+               $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(ghclibexecdir)"); \
        done
 # We rename ghc-stage2, so that the right program name is used in error
 # messages etc.
@@ -848,38 +883,38 @@ else
 endif
 
 install_topdirs: $(INSTALL_TOPDIRS)
-       $(INSTALL_DIR) "$(DESTDIR)$(topdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(topdir)")
        for i in $(INSTALL_TOPDIRS); do \
-               $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \
+               $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(topdir)"); \
        done
 
 install_headers: $(INSTALL_HEADERS)
-       $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)")
        for i in $(INSTALL_HEADERS); do \
-               $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \
+               $(call INSTALL_HEADER,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghcheaderdir)"); \
        done
 
 install_docs: $(INSTALL_DOCS)
-       $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(docdir)")
 ifneq "$(INSTALL_DOCS)" ""
        for i in $(INSTALL_DOCS); do \
-               $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)"; \
+               $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)"); \
        done
 endif
-       $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html"
-       $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
+       $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
+       $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
 ifneq "$(INSTALL_LIBRARY_DOCS)" ""
-       $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries"
+       $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries")
        for i in $(INSTALL_LIBRARY_DOCS); do \
-               $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
+               $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)/html/libraries/"); \
        done
-       $(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"
-       $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
+       $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/")
+       $(call INSTALL_SCRIPT,$(INSTALL_OPTS),libraries/gen_contents_index,"$(DESTDIR)$(docdir)/html/libraries/")
 endif
 ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
        for i in $(INSTALL_HTML_DOC_DIRS); do \
-               $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
-               $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
+               $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \
+               $(call INSTALL_DOC,$(INSTALL_OPTS),$$i/*,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \
        done
 endif
 
@@ -895,36 +930,30 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
-INSTALLED_PACKAGES := $(filter-out $(INTREE_ONLY_PACKAGES),$(PACKAGES))
+INSTALLED_PKG_DIRS := $(addprefix libraries/,$(PACKAGES)) \
+                      compiler \
+                      $(addprefix libraries/,$(PACKAGES_STAGE2))
 ifeq "$(InstallExtraPackages)" "NO"
-INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES))
+INSTALLED_PKG_DIRS := $(filter-out $(addprefix libraries/,$(EXTRA_PACKAGES)),\
+                                   $(INSTALLED_PKG_DIRS))
 endif
+INSTALLED_PKG_DIRS := $(filter-out $(addprefix libraries/,$(INTREE_ONLY_PACKAGES)),\
+                                   $(INSTALLED_PKG_DIRS))
 
-HIDDEN_PACKAGES = binary
-
-define set_INSTALL_DISTDIR
-# $1 = libraries/base, $2 = dist-install
-# =>
-# INSTALL_DISTDIR_libraries/base = dist-install
-INSTALL_DISTDIR_$1 = $2
-endef
-
-$(eval $(foreach p,$(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
-$(call set_INSTALL_DISTDIR,libraries/$p,dist-install)))
+# Set the INSTALL_DISTDIR_p for each package; compiler is special
+$(foreach p,$(filter-out compiler,$(INSTALLED_PKG_DIRS)),\
+   $(eval INSTALL_DISTDIR_$p = dist-install))
 INSTALL_DISTDIR_compiler = stage2
 
-ALL_INSTALLED_PACKAGES = $(addprefix libraries/,$(INSTALLED_PACKAGES)) \
-                         compiler \
-                         $(addprefix libraries/,$(PACKAGES_STAGE2))
-
+# Now we can do the installation
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
-       $(INSTALL_DIR) "$(DESTDIR)$(topdir)"
+       $(call INSTALL_DIR,"$(DESTDIR)$(topdir)")
        "$(RM)" $(RM_OPTS_REC) "$(INSTALLED_PACKAGE_CONF)"
-       $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)"
+       $(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)")
        "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install
        "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
-       $(foreach p, $(ALL_INSTALLED_PACKAGES),                       \
+       $(foreach p, $(INSTALLED_PKG_DIRS),                           \
            $(call make-command,                                      \
                   "$(GHC_CABAL_INPLACE)" install                     \
                                          "$(INSTALLED_GHC_REAL)"     \
@@ -959,18 +988,18 @@ $(eval $(call bindist,.,\
     Makefile \
     mk/config.mk.in \
     $(INPLACE_BIN)/mkdirhier \
-    $(INPLACE_BIN)/ghc-cabal \
-    utils/ghc-pwd/ghc-pwd \
-       $(BINDIST_WRAPPERS) \
-       $(BINDIST_PERL_SOURCES) \
-       $(BINDIST_LIBS) \
-       $(BINDIST_HI) \
-       $(BINDIST_EXTRAS) \
-       $(includes_H_CONFIG) \
-       $(includes_H_PLATFORM) \
+    utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \
+    utils/ghc-pwd/dist/build/tmp/ghc-pwd \
+    $(BINDIST_WRAPPERS) \
+    $(BINDIST_PERL_SOURCES) \
+    $(BINDIST_LIBS) \
+    $(BINDIST_HI) \
+    $(BINDIST_EXTRAS) \
+    $(includes_H_CONFIG) \
+    $(includes_H_PLATFORM) \
     $(includes_H_FILES) \
-       includes/ghcconfig.h \
-       includes/rts/Config.h \
+    includes/ghcconfig.h \
+    includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -980,21 +1009,21 @@ $(eval $(call bindist,.,\
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
-       docs/index.html \
-       compiler/stage2/doc \
-       $(wildcard libraries/*/dist-install/doc/) \
-       $(wildcard libraries/*/*/dist-install/doc/) \
+    docs/index.html \
+    compiler/stage2/doc \
+    $(wildcard libraries/*/dist-install/doc/) \
+    $(wildcard libraries/*/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \
-       mk/project.mk \
-       mk/install.mk.in \
-       bindist.mk \
-       libraries/gen_contents_index \
-       libraries/prologue.txt \
-       libraries/dph/LICENSE \
-       libraries/dph/ghc-packages \
-       libraries/dph/ghc-packages2 \
-       libraries/dph/ghc-stage2-package \
+    mk/project.mk \
+    mk/install.mk.in \
+    bindist.mk \
+    libraries/gen_contents_index \
+    libraries/prologue.txt \
+    $(wildcard libraries/dph/LICENSE \
+               libraries/dph/ghc-packages \
+               libraries/dph/ghc-packages2 \
+               libraries/dph/ghc-stage2-package) \
  ))
 endif
 # mk/project.mk gets an absolute path, so we manually include it in
@@ -1012,6 +1041,7 @@ unix-binary-dist-prep:
        echo "BUILD_DOCBOOK_PS   = $(BUILD_DOCBOOK_PS)"   >> $(BIN_DIST_MK)
        echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
        echo "BUILD_MAN          = $(BUILD_MAN)"          >> $(BIN_DIST_MK)
+       echo "GHC_CABAL_INPLACE  = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK)
        cd $(BIN_DIST_PREP_DIR) && autoreconf
        "$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
 # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
@@ -1051,9 +1081,15 @@ ifeq "$(mingw32_TARGET_OS)" "1"
        $(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist)
 endif
 
+ifeq "$(mingw32_TARGET_OS)" "1"
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/doc
+else
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/share/doc/ghc
+endif
+
 .PHONY: publish-docs
 publish-docs:
-       $(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs)
+       $(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs)
 
 # -----------------------------------------------------------------------------
 # Source distributions
@@ -1078,7 +1114,7 @@ publish-docs:
 # Directory in which we're going to build the src dist
 #
 SRC_DIST_NAME=ghc-$(ProjectVersion)
-SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
+SRC_DIST_DIR=$(TOP)/$(SRC_DIST_NAME)
 
 #
 # Files to include in source distributions
@@ -1168,10 +1204,6 @@ sdist_%:
 
 .PHONY: clean
 
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
 CLEAN_FILES += libraries/bootstrapping.conf
 CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
 CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants
@@ -1225,6 +1257,8 @@ distclean : clean
        "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h
        "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h
        "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h
+       "$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist
+       "$(RM)" $(RM_OPTS_REC) inplace
 
        "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2))
        "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))