X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a788dac4661d4ece4c90352da9ea0f23972b06f1;hb=dc5fc2a6d44009577f5d1ba6a403ed5e1ab22af5;hp=c058743f4646359cc6486af9263d1215db9d4938;hpb=6b2adb8d5052aa2a5dd4000beacc1f3b402257a6;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index c058743..a788dac 100644
--- 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 ::
@@ -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 \
 	)