Build the libraries with cabal

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 19c05a3..98efc8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,8 +96,8 @@ stage1 : check-packages
          $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
          if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
        done
-       @$(MAKE) -C libraries boot
-       @$(MAKE) -C libraries all
+       $(MAKE) -C libraries boot
+       $(MAKE) -C libraries all
 
 stage2 : check-packages
        $(MAKE) -C compiler boot stage=2
@@ -206,7 +206,7 @@ install-docs ::
 # 
 
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs
+BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs-ghc
 else
 BinDistShScripts =
 endif
@@ -214,7 +214,6 @@ endif
 BinDistPrlScripts = ghcprof
 BinDistLibPrlScripts = ghc-asm ghc-split
 BinDistBins = hp2ps runghc
-BinDistOptBins = runhaskell
 BinDistLinks = ghc ghci ghc-pkg
 BinDistLibSplicedFiles = package.conf
 BinDistDirs = includes compiler docs driver libraries rts utils