Combine treatment of vanialla/GADT data decls, and fix assert failure

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index c137ab3..9dba678 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -804,7 +804,7 @@ INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
 INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
-HIDDEN_PACKAGES = ghc-binary
+HIDDEN_PACKAGES = binary
 
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
@@ -981,6 +981,8 @@ sdist-prep :
        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
+       rm -rf $(SRC_DIST_DIR)/libraries/tarballs/
+       rm -rf $(SRC_DIST_DIR)/libraries/stamp/
        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)