X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6ce05dc95d3af1d1ad72e7035bee198babbcf89a;hb=def38ba3e80a7e8a2a3e63b9bbaa4a61e9a729ff;hp=a00fa07f6c66afaea451546f8064f64130931a06;hpb=9cf402a87eda9eb2f1eb19e2be901d838861c7d6;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index a00fa07..6ce05dc 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ project-check :
 # -----------------------------------------------------------------------------
 # Targets: all, stage1, stage2, stage3
 
-DIST_CLEAN_FILES += config.cache config.status
+DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h
 
 extraclean::
 	$(RM) -rf autom4te.cache
@@ -211,6 +211,10 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      config.sub   \
 	      aclocal.m4
 
+ifeq "$(darwin_TARGET_OS)" "1"
+BIN_DIST_TOP+=mk/fix_install_names.sh
+endif
+
 #
 # binary-dist creates a binary bundle, set BIN_DIST_NAME
 # to package name and do `make binary-dist Project=<project-name>'
@@ -269,6 +273,7 @@ binary-dist::
 	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 "Generating a shippable configure script.."
@@ -284,10 +289,12 @@ binary-dist::
 	fi
 #
 # binary dist'ing the documentation.  
-# Which documentation to build/install is hardcoded below.
-#
+# The default documentation to build/install is given below; overrideable
+# via build.mk or the 'make' command-line.
 
+ifndef BINDIST_DOC_WAYS
 BINDIST_DOC_WAYS = html ps
+endif
 # BINDIST_DOC_WAYS =
 
 binary-dist ::