X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=291d71465a0efd19ca63f946fde08a62c9629192;hb=064562360a310f08592d41e9fceb3404932c4a04;hp=e2d721d98bfc45fff84c390a01b321d4f3dd14b0;hpb=8a2b4cfc761466e51bd77e7f40d70df5c2747578;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index e2d721d..291d714 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -841,6 +841,10 @@ $(eval $(call bindist,.,\
 	$(BINDIST_LIBS) \
 	$(BINDIST_HI) \
 	$(BINDIST_EXTRAS) \
+	$(includes_H_CONFIG) \
+	$(includes_H_PLATFORM) \
+	includes/ghcconfig.h \
+	includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -954,7 +958,7 @@ sdist_file = \
     "$(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"; \
+    echo "does not exist: $1/$2/build/$4.hs"; \
     exit 1; \
   fi
 
@@ -963,25 +967,20 @@ 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
+	cd $(SRC_DIST_DIR) && 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
+	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmLex,x)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,cmm,CmmParse,y)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Lexer,x)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,Parser,y.pp)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,ParserCore,y)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/hpc,dist,,HpcParser,y)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x)
+	cd $(SRC_DIST_DIR) && $(call sdist_file,utils/genprimopcode,dist,,Parser,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