Minor refactoring
[ghc-hetmet.git] / ghc.mk
diff --git a/ghc.mk b/ghc.mk
index 91b5d3d..9e1026e 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -39,8 +39,6 @@
 #
 #   * per-source-file dependencies instead of one .depend file?
 #   * eliminate undefined variables, and use --warn-undefined-variables?
-#   * perhaps we should make all the output dirs in the .depend rule, to
-#     avoid all these mkdirhier calls?
 #   * put outputs from different ways in different subdirs of distdir/build,
 #     then we don't have to use -osuf/-hisuf.  We would have to install
 #     them in different places too, so we'd need ghc-pkg support for packages
 
 .PHONY: default all haddock
 
+# We need second expansion for the way we handle directories, so that
+#     | $$$$(dir $$$$@)/.
+# expands to the directoy of a rule that uses a % pattern.
+.SECONDEXPANSION:
+
 default : all
 
+# Catch make if it runs away into an infinite loop
+ifeq      "$(MAKE_RESTARTS)" ""
+else ifeq "$(MAKE_RESTARTS)" "1"
+else ifeq "$(MAKE_RESTARTS)" "2"
+else
+$(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
+endif
+
 # Just bring makefiles up to date:
 .PHONY: just-makefiles
 just-makefiles:
@@ -124,6 +135,8 @@ $(error Please run ./configure first)
 endif
 endif
 
+include mk/ways.mk
+
 # (Optional) build-specific configuration
 include mk/custom-settings.mk
 
@@ -163,9 +176,6 @@ NO_INCLUDE_DEPS = YES
 # We want package-data.mk for show
 endif
 
-# We don't haddock base3-compat, as it has the same package name as base
-libraries/base3-compat_dist-install_DO_HADDOCK = NO
-
 # We don't haddock the bootstrapping libraries
 libraries/hpc_dist-boot_DO_HADDOCK = NO
 libraries/Cabal_dist-boot_DO_HADDOCK = NO
@@ -318,9 +328,7 @@ $(eval $(call addPackage,extensible-exceptions))
 $(eval $(call addPackage,haskell98))
 $(eval $(call addPackage,hpc))
 $(eval $(call addPackage,pretty))
-$(eval $(call addPackage,syb))
 $(eval $(call addPackage,template-haskell))
-$(eval $(call addPackage,base3-compat))
 $(eval $(call addPackage,Cabal))
 $(eval $(call addPackage,binary))
 $(eval $(call addPackage,bin-package-db))
@@ -393,6 +401,15 @@ rts/package.conf.inplace : libffi/package.conf.inplace
 endif
 
 # -----------------------------------------------------------------------------
+# Directories
+
+# Don't try to delete directories:
+.PRECIOUS: %/.
+
+%/. : $(MKDIRHIER)
+       "$(MKDIRHIER)" $@
+
+# -----------------------------------------------------------------------------
 # Special magic for the ghc-prim package
 
 # We want the ghc-prim package to include the GHC.Prim module when it
@@ -412,8 +429,7 @@ endef
 
 PRIMOPS_TXT = $(GHC_COMPILER_DIR)/prelude/primops.txt
 
-libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT)
-       "$(MKDIRHIER)" $(dir $@)
+libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) | $$(dir $$@)/.
        "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers <$(PRIMOPS_TXT) >$@
 
 libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT)
@@ -496,9 +512,11 @@ BUILD_DIRS += \
    $(GHC_GENAPPLY_DIR)
 endif
 
+ifneq "$(HADDOCK_DOCS)" "NO"
 BUILD_DIRS += \
    utils/haddock \
    utils/haddock/doc
+endif
 
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
@@ -591,12 +609,6 @@ $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-instal
 # XXX Hack; remove this
 $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
 
-# XXX we configure packages with the bootstrapping compiler (for
-# dependency reasons, see the phase ordering), which doesn't
-# necessarily support all the extensions we need, and Cabal filters
-# out the ones it thinks aren't supported.
-libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
-
 # A useful pseudo-target
 .PHONY: stage1_libs
 stage1_libs : $(ALL_STAGE1_LIBS)
@@ -606,6 +618,8 @@ libraries/index.html: $(ALL_HADDOCK_FILES)
        cd libraries && sh gen_contents_index --inplace
 $(eval $(call all-target,library_doc_index,libraries/index.html))
 INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
+CLEAN_FILES += libraries/doc-index* libraries/haddock*.css \
+              libraries/haddock*.js libraries/index*.html libraries/*.gif
 endif
 
 ifeq "$(CHECK_PACKAGES)" "YES"
@@ -661,7 +675,7 @@ $(ghc_stage1_depfile) : $(compiler_stage1_v_LIB)
 #
 # If you miss any out here, then 'make -j8' will probably tell you.
 #
-libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf)
+libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) libraries/Cabal/dist-boot/build/Distribution/InstalledPackageInfo.$(v_hisuf)
 
 $(foreach pkg,$(BOOT_PKGS),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts)))
 
@@ -672,26 +686,11 @@ endif
 
 ifeq "$(Windows)" "YES"
 
-# directories don't work well as dependencies, hence a stamp file
-$(INPLACE)/stamp-mingw : $(MKDIRHIER)
-       $(MKDIRHIER) $(INPLACE_MINGW)/bin
-       GCC=`type -p $(WhatGccIsCalled)`; \
-       GccDir=`dirname $$GCC`; \
-       "$(CP)" -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \
-       "$(CP)" -Rp $$GccDir/../include $(INPLACE_MINGW); \
-       "$(CP)" -Rp $$GccDir/../lib     $(INPLACE_MINGW); \
-       "$(CP)" -Rp $$GccDir/../libexec $(INPLACE_MINGW); \
-       "$(CP)" -Rp $$GccDir/../mingw32 $(INPLACE_MINGW)
-       touch $(INPLACE)/stamp-mingw
-
 install : install_mingw
 .PHONY: install_mingw
 install_mingw : $(INPLACE_MINGW)
        "$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
 
-$(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll :
-       "$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB)
-
 endif # Windows
 
 libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \
@@ -699,13 +698,13 @@ libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \
     libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs
 
 libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
-                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER)
-       "$(MKDIRHIER)" $(dir $@)
+                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \
+                          | $$(dir $$@)/.
        "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@
 
 libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
-                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER)
-       "$(MKDIRHIER)" $(dir $@)
+                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \
+                          | $$(dir $$@)/.
        "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@
 
 # -----------------------------------------------------------------------------
@@ -744,16 +743,24 @@ install_libs: $(INSTALL_LIBS)
        done
 
 install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
+ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
+       @:
+else
        $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
        for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
                $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
        done
+endif
 
 install_libexecs:  $(INSTALL_LIBEXECS)
+ifeq "$(INSTALL_LIBEXECS)" ""
+       @:
+else
        $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir)
        for i in $(INSTALL_LIBEXECS); do \
                $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
        done
+endif
 
 install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
        $(INSTALL_DIR) $(DESTDIR)$(topdir)
@@ -775,18 +782,24 @@ install_headers: $(INSTALL_HEADERS)
 
 install_docs: $(INSTALL_HEADERS)
        $(INSTALL_DIR) $(DESTDIR)$(docdir)
+ifneq "$(INSTALL_DOCS)" ""
        for i in $(INSTALL_DOCS); do \
                $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
        done
-       $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \
-       $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \
+endif
+       $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html
+       $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html
+ifneq "$(INSTALL_LIBRARY_DOCS)" ""
        for i in $(INSTALL_LIBRARY_DOCS); do \
                $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \
        done
+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`; \
        done
+endif
 
 INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
 
@@ -796,10 +809,13 @@ ifeq "$(Windows)" "NO"
 INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg
 else
-INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc-stage2.exe
+INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
+INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
+HIDDEN_PACKAGES = binary
+
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
        $(INSTALL_DIR) $(DESTDIR)$(topdir)
@@ -807,19 +823,24 @@ install_packages: libffi/package.conf.install rts/package.conf.install
        $(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, $(PACKAGES) $(PACKAGES_STAGE2),\
+       $(foreach p, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
            "$(GHC_CABAL_INPLACE)" install \
                 $(INSTALLED_GHC_REAL) \
                 $(INSTALLED_GHC_PKG_REAL) \
                 $(DESTDIR)$(topdir) \
                 libraries/$p dist-install \
-                '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true
+                '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+                $(RelocatableBuild) &&) true
+       $(foreach p, $(HIDDEN_PACKAGES),\
+           $(INSTALLED_GHC_PKG_REAL) --global-conf $(INSTALLED_PACKAGE_CONF) \
+                                     hide $p &&) true
        "$(GHC_CABAL_INPLACE)" install \
                 $(INSTALLED_GHC_REAL) \
                 $(INSTALLED_GHC_PKG_REAL) \
                 $(DESTDIR)$(topdir) \
                 compiler stage2 \
-                '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries'
+                '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
+                $(RelocatableBuild)
 
 # -----------------------------------------------------------------------------
 # Binary distributions
@@ -841,6 +862,11 @@ $(eval $(call bindist,.,\
        $(BINDIST_LIBS) \
        $(BINDIST_HI) \
        $(BINDIST_EXTRAS) \
+       $(includes_H_CONFIG) \
+       $(includes_H_PLATFORM) \
+    $(includes_H_FILES) \
+       includes/ghcconfig.h \
+       includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -864,31 +890,35 @@ endif
 # mk/project.mk gets an absolute path, so we manually include it in
 # the bindist with a relative path
 
-BIN_DIST_MK = $(BIN_DIST_NAME)/bindist.mk
+BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk
 
-binary-dist:
-       "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME)
-       mkdir $(BIN_DIST_NAME)
-       set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
+unix-binary-dist-prep:
+       "$(RM)" $(RM_OPTS) -r bindistprep/
+       "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
+       set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
        echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
        echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
        echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
        echo "BUILD_DOCBOOK_PS   = $(BUILD_DOCBOOK_PS)"   >> $(BIN_DIST_MK)
        echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
-       ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
-       cd $(BIN_DIST_NAME) && autoreconf
-       "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR)
+       ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac
+       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
 # tree then we want to include the real file, not a symlink to it
-       "$(TAR)" hcf - -T $(BIN_DIST_LIST) | bzip2 -c > $(BIN_DIST_TAR_BZ2)
+       cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
-windows-binary-dist:
-       "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME)
-       $(MAKE) prefix=$(BIN_DIST_DIR) install
-       "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > $(BIN_DIST_TAR_BZ2)
+windows-binary-dist-prep:
+       "$(RM)" $(RM_OPTS) -r bindistprep/
+       $(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install
+       cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
-       "$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+ifeq "$(ISCC)" ""
+       @echo No ISCC, so not making installer
+else
+       "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+endif
 
 nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
 
@@ -946,42 +976,36 @@ VERSION :
 sdist : VERSION
 
 # Use:
-#     $(call sdist_file,compiler,stage2,cmm,CmmLex,x)
-# to copy the generated file that replaces compiler/cmm/CmmLex.x, where
+#     $(call sdist_file,compiler,stage2,cmm,Foo/Bar,CmmLex,x)
+# to copy the generated file that replaces compiler/cmm/Foo/Bar/CmmLex.x, where
 # "stage2" is the dist dir.
-sdist_file = \
-  if test -f $(TOP)/$1/$2/build/$4.hs; then \
-    "$(CP)" $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \
-    mv $1/$3/$4.$5 $1/$3/$4.$5.source ;\
-  else \
-    echo "does not exist: $1/$2//build/$4.hs"; \
-    exit 1; \
-  fi
+define sdist_file
+       "$(CP)" $1/$2/build/$4/$5.hs $(SRC_DIST_DIR)/$1/$3/$4
+       mv $(SRC_DIST_DIR)/$1/$3/$4/$5.$6 $(SRC_DIST_DIR)/$1/$3/$4/$5.$6.source
+endef
 
 .PHONY: sdist-prep
 sdist-prep :
        "$(RM)" $(RM_OPTS) -r $(SRC_DIST_DIR)
        "$(RM)" $(RM_OPTS) $(SRC_DIST_TARBALL)
        mkdir $(SRC_DIST_DIR)
-       ( cd $(SRC_DIST_DIR) \
-         && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(TOP)/$$i ); done \
-         && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done \
-         && $(MAKE) distclean \
-         && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then "$(CP)" $(TOP)/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 \
-         && $(call sdist_file,compiler,stage2,cmm,CmmLex,x) \
-         && $(call sdist_file,compiler,stage2,cmm,CmmParse,y) \
-         && $(call sdist_file,compiler,stage2,main,ParsePkgConf,y) \
-         && $(call sdist_file,compiler,stage2,parser,HaddockLex,x) \
-         && $(call sdist_file,compiler,stage2,parser,HaddockParse,y) \
-         && $(call sdist_file,compiler,stage2,parser,Lexer,x) \
-         && $(call sdist_file,compiler,stage2,parser,Parser,y.pp) \
-         && $(call sdist_file,compiler,stage2,parser,ParserCore,y) \
-         && $(call sdist_file,utils/hpc,dist,,HpcParser,y) \
-         && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x) \
-         && $(call sdist_file,utils/genprimopcode,dist,,Parser,y) \
-         && "$(RM)" $(RM_OPTS) -r 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" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r \
-       )
+       cd $(SRC_DIST_DIR) && for i in $(SRC_DIST_DIRS); do mkdir $$i; ( cd $$i && lndir $(TOP)/$$i ); done
+       cd $(SRC_DIST_DIR) && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done
+       cd $(SRC_DIST_DIR) && $(MAKE) distclean
+       rm -rf $(SRC_DIST_DIR)/libraries/tarballs/
+       rm -rf $(SRC_DIST_DIR)/libraries/stamp/
+       $(call sdist_file,compiler,stage2,cmm,,CmmLex,x)
+       $(call sdist_file,compiler,stage2,cmm,,CmmParse,y)
+       $(call sdist_file,compiler,stage2,parser,,Lexer,x)
+       $(call sdist_file,compiler,stage2,parser,,Parser,y.pp)
+       $(call sdist_file,compiler,stage2,parser,,ParserCore,y)
+       $(call sdist_file,utils/hpc,dist,,,HpcParser,y)
+       $(call sdist_file,utils/genprimopcode,dist,,,Lexer,x)
+       $(call sdist_file,utils/genprimopcode,dist,,,Parser,y)
+       $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Lex,x)
+       $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Parse,y)
+       cd $(SRC_DIST_DIR) && "$(RM)" $(RM_OPTS) -r compiler/stage[123] mk/build.mk
+       cd $(SRC_DIST_DIR) && "$(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" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r
 
 .PHONY: sdist
 sdist : sdist-prep
@@ -1047,6 +1071,11 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\
   $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install)))
 endif
 
+clean : clean_bindistprep
+.PHONY: clean_bindistprep
+clean_bindistprep:
+       "$(RM)" $(RM_OPTS) -r bindistprep/
+
 distclean : clean
        "$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h
        "$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk