X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=2170c436bb8c3b5d30c2de335ce7b7e69f816395;hb=cd5099a029e06fb974c37cf453a87e5cf5e0fc29;hp=9e708fbeb01bb016b7ef0df75be8c9634fa4dc11;hpb=2994e921b179f9989fef2a98fa0d78bf5444d8f9;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 9e708fb..2170c43 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -124,6 +124,8 @@ $(error Please run ./configure first)
 endif
 endif
 
+include mk/ways.mk
+
 # (Optional) build-specific configuration
 include mk/custom-settings.mk
 
@@ -606,6 +608,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 +800,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
 
@@ -973,8 +977,6 @@ sdist-prep :
 	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,HaddockLex,x)
-	cd $(SRC_DIST_DIR) && $(call sdist_file,compiler,stage2,parser,HaddockParse,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)