X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=cc5e527e51234ce57f29c79b61a07181bfd37596;hb=f3c4dc2acac239016e56d33f9fed4674be61c8a6;hp=a8a4b70157538a7ff94245ffe0e9d6fd4db0075e;hpb=945aefc681772d32cfc67cc7d4d3d831ece75a05;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index a8a4b70..cc5e527 100644
--- 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) \
@@ -862,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
@@ -1065,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