-ftype-families -> -XTypeFamilies

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index fcd1ad5..a788dac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,14 +69,15 @@ SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-       @for d in `cat libraries/boot-packages`; do \
+       @ds=`cat libraries/boot-packages`;\
+       for d in $$ds; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \
             echo "maybe you haven't done './darcs-all get'?"; \
             exit 1; \
          fi \
        done
-       @if test ! -e libraries/base/configure; then \
+       @if test ! -f libraries/base/configure; then \
            echo "Looks like you're missing base's configure script."; \
            echo "Did you run 'sh boot' at the top level?"; \
            exit 1; \
@@ -139,7 +140,7 @@ all :: stamp.inplace-gcc-lib
 stamp.inplace-gcc-lib:
        $(RM) -r compiler/gcc-lib
        mkdir compiler/gcc-lib
-       cp $(GccDir)ld.exe compiler/gcc-lib
+       cp $(LD) compiler/gcc-lib
        touch $@
 
 clean ::
@@ -250,7 +251,7 @@ binary-dist::
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
-       $(MAKE) DESTDIR=$(BIN_DIST_DIR) prefix=/. install
+       $(MAKE) prefix=$(BIN_DIST_DIR) install
 
 binary-dist::
        cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
@@ -506,6 +507,7 @@ dist ::
          && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
          && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
          && $(MAKE) distclean \
+         && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; fi \
          && $(RM) -rf compiler/stage[123] mk/build.mk \
          && $(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" \) -print | xargs $(RM) -rf \
        )