Pass the location of gcc in the ghc wrapper script; partially fixes #3863

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 768ff15..cc5e527 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -494,6 +494,7 @@ endif
 
 BUILD_DIRS += \
    docs/users_guide \
+   docs/ext-core \
    docs/man \
    libraries/Cabal/doc \
    $(GHC_UNLIT_DIR) \
@@ -751,6 +752,9 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
 .PHONY: tags
 tags: tags_compiler
 
+.PHONY: TAGS
+TAGS: TAGS_compiler
+
 # -----------------------------------------------------------------------------
 # Installation
 
@@ -859,7 +863,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
-INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
+INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES))
 HIDDEN_PACKAGES = binary
 
 define set_INSTALL_DISTDIR
@@ -1062,8 +1066,8 @@ sdist-prep :
        $(call sdist_file,utils/hpc,dist,,,HpcParser,y)
        $(call sdist_file,utils/genprimopcode,dist,,,Lexer,x)
        $(call sdist_file,utils/genprimopcode,dist,,,Parser,y)
-       $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Lex,x)
-       $(call sdist_file,utils/haddock,dist,src,Haddock/Interface,Parse,y)
+       $(call sdist_file,utils/haddock,dist,src,Haddock,Lex,x)
+       $(call sdist_file,utils/haddock,dist,src,Haddock,Parse,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)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS) -r