X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=aefa4b44d1590fdae6af6fe2b93a96e5a8eb446e;hb=53c7c4675406f3c49533009b1666d6c4532cc8c4;hp=ccfe54c6140069cce0c7ad6edbe004f4aaccffb5;hpb=32c070d25cb6d0ea1e3e3f4a19303cdd3f8eea20;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index ccfe54c..aefa4b4 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -606,6 +606,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"
@@ -796,7 +798,7 @@ 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
 
@@ -843,6 +845,8 @@ $(eval $(call bindist,.,\
 	$(BINDIST_EXTRAS) \
 	$(includes_H_CONFIG) \
 	$(includes_H_PLATFORM) \
+	includes/ghcconfig.h \
+	includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -956,7 +960,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
 
@@ -965,25 +969,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