X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=da862f1cdda9ac48ac64b369c6effc31a7e3727d;hb=cbc7228335a0489362d8f5deadaecacc8731a4ce;hp=7b1fd9dfe99a2ee3676b26d3b75bb8c78cb9e96f;hpb=068f6bdf5b84792213f8e7628417516861b6b51b;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 7b1fd9d..da862f1 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
@@ -291,7 +291,7 @@ BINDIST_DOC_WAYS = html ps
 # BINDIST_DOC_WAYS =
 
 binary-dist ::
-ifneq "$(DOCBOOK_CATALOG)" ""
+ifneq "$(DIR_DOCBOOK_XSL)" ""
 	@for i in $(BIN_DIST_DIRS); do 		 	 	\
 	  if test -d "$$i"; then 			 	\
 	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
@@ -391,7 +391,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
 
@@ -441,7 +441,11 @@ hc-file-bundle : project-check
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/rts/AutoApply.hc >> hc-files-to-go
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/rts -name "*.cmm" -follow -print` ""; do \
+	     if test "x$$f" != "x"; then \
+	        echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \
+	     fi; \
+	done;
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go