X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=492cc77a03bcb8130d524b254d710f0b4afa17f9;hp=d1426c77aaad705b74beb93de3d3e111235e3f16;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hpb=e05f9de137269701df667b69d741dfae616694f7

diff --git a/Makefile b/Makefile
index d1426c7..492cc77 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,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 +250,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 +506,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 \
 	)
@@ -562,7 +563,7 @@ hc-file-bundle :
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
-	ghc.spec docs/users_guide/ug-book.xml
+	ghc.spec docs/users_guide/ug-book.xml extra-gcc-opts
 
 # don't clean config.mk: it's needed when cleaning stuff later on
 LATE_DIST_CLEAN_FILES += mk/config.mk 
@@ -575,6 +576,7 @@ extraclean::
 
 clean distclean ::
 	$(MAKE) -C bindisttest $@
+	if test -d testsuite; then $(MAKE) -C testsuite $@; fi
 
 # -----------------------------------------------------------------------------