X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=gmp%2FMakefile;h=8f2097c1057ffbb4bd1893da7eefe14f5a3e60e0;hp=b3b8104d8aec592356e6e61b83b13f9f66a885ea;hb=f5edc6b0871a0debbc9a64f4cdb95c0dc35e5b16;hpb=730388fc60655b63a9491a1cafa236fea097516c

diff --git a/gmp/Makefile b/gmp/Makefile
index b3b8104..8f2097c 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -36,7 +36,6 @@ PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
 GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
 GMP_DIR := $(subst .tar.gz,,$(GMP_TARBALL))
-BMP_BUILD_DIR := build
 
 ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
 BUILD_SHARED=yes
@@ -45,18 +44,18 @@ BUILD_SHARED=no
 endif
 
 boot :: stamp.gmp.static
+BINDIST_STAMPS = stamp.gmp.static
 INSTALL_HEADERS += gmp.h
 INSTALL_LIBS += libgmp.a
 
 ifeq "$(BUILD_SHARED)" "yes"
 boot :: stamp.gmp.shared
+BINDIST_STAMPS += stamp.gmp.shared
 INSTALL_LIBS += libgmp.dll.a
 INSTALL_PROGS += libgmp-3.dll
 endif
 
-ifneq "$(DOING_BIN_DIST)" "YES"
 install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
-endif
 
 stamp.gmp.static:
 	$(RM) -rf $(GMP_DIR) gmpbuild
@@ -64,7 +63,8 @@ stamp.gmp.static:
 	mv $(GMP_DIR) gmpbuild
 	chmod +x ln
 	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-	    export PATH=`pwd`:$$PATH; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
 	    cd gmpbuild && \
 	    CC=$(WhatGccIsCalled) $(SHELL) configure \
 	          --enable-shared=no --host=$(PLATFORM) --build=$(PLATFORM)
@@ -76,7 +76,8 @@ stamp.gmp.shared:
 	mv $(GMP_DIR) gmpbuild-shared
 	chmod +x ln
 	(set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
-	    export PATH=`pwd`:$$PATH; \
+	    PATH=`pwd`:$$PATH; \
+	    export PATH; \
 	    cd gmpbuild-shared && \
 	    CC=$(WhatGccIsCalled) $(SHELL) configure \
 	          --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
@@ -120,6 +121,7 @@ binary-dist:
 	$(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
 ifneq "$(HaveLibGmp)" "YES"
  ifneq "$(HaveFrameworkGMP)" "YES"
+	$(INSTALL_DATA)    $(BINDIST_STAMPS)   $(BIN_DIST_DIR)/gmp/
   ifneq "$(INSTALL_PROGS)" ""
 	$(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/
   endif