X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a8350fa24d3c2096bd7269d15288706b6c8b87b5;hb=73a0481089ea23d12fe31dbeb222ac348cb90f7b;hp=f62fb22d6e6a637790ae373c36025321baafcb0e;hpb=9803f480ce255c8d2bf448d174377ee76e18a658;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index f62fb22..a8350fa 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,11 +289,28 @@ 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
+
+ifneq "$(XSLTPROC)" ""
+BINDIST_DOC_WAYS = html
+ifneq "$(FOP)" ""
+BINDIST_DOC_WAYS += ps pdf
+else
+ifneq "$(PDFXMLTEX)" ""
+BINDIST_DOC_WAYS += pdf
+endif
+ifneq "$(XMLTEX)" ""
+ifneq "$(DVIPS)" ""
+BINDIST_DOC_WAYS += ps
+endif # DVIPS
+endif # XMLTEX
+endif # FOP
+endif # XSLTPROC
 
-BINDIST_DOC_WAYS = html ps
-# BINDIST_DOC_WAYS =
+endif # BINDIST_DOC_WAYS
 
 binary-dist ::
 ifneq "$(DIR_DOCBOOK_XSL)" ""
@@ -391,7 +413,7 @@ SRC_DIST_FILES += \
 	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/fptools.css mk/fix_install_names.sh
 
 dist dist-manifest dist-package :: project-check
 
@@ -403,8 +425,8 @@ dist ::
 	-$(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
+	$(FIND) $(SRC_DIST_DIRS) -type d \( -name _darcs -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 _darcs -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
 
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.