X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=64d317b75663cd7323b5b96720ee3d9627c5b9e9;hb=fc15f6e876f3b8202a1053f809253b39dc8a8923;hp=f77f9eb8e1acd793e0a816cce9c649b99cba194f;hpb=e257cdbf9c13fc8dedacc7c468c30fba3e89009b;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index f77f9eb..64d317b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -53,7 +53,6 @@
 #
 #   * 2966 make sure --with-gcc does the right thing (#2966)
 #   * 1693 make distclean
-#   * 2689 make maintainer-clean
 #   * 3173 make install with DESTDIR
 
 # Possible cleanups:
@@ -134,6 +133,8 @@ show:
 # -----------------------------------------------------------------------------
 # Include subsidiary build-system bits
 
+include mk/tree.mk
+
 ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 include mk/config.mk
 ifeq "$(ProjectVersion)" ""
@@ -211,6 +212,10 @@ include rules/c-objs.mk
 # -----------------------------------------------------------------------------
 # Suffix rules
 
+# Suffix rules cause "make clean" to fail on Windows (trac #3233)
+# so we don't make any when cleaning.
+ifneq "$(CLEANING)" "YES"
+
 include rules/hs-suffix-rules-srcdir.mk
 include rules/hs-suffix-rules.mk
 
@@ -227,6 +232,8 @@ $(foreach way,$(ALL_WAYS),\
 
 include rules/c-suffix-rules.mk
 
+endif
+
 # -----------------------------------------------------------------------------
 # Building package-data.mk files from .cabal files
 
@@ -741,6 +748,7 @@ $(eval $(call bindist,.,\
     $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
 	mk/fix_install_names.sh \
 	mk/project.mk \
+	libraries/dph/LICENSE \
  ))
 # mk/project.mk gets an absolute path, so we manually include it in
 # the bindist with a relative path