First cut at reviving the External Core tools

[ghc-hetmet.git] / gmp / Makefile

diff --git a/gmp/Makefile b/gmp/Makefile
index b3b8104..de36b2d 100644 (file)
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -45,18 +45,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 +64,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 +77,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 +122,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