Fix bashisms; patch from Bernie Pope

[ghc-hetmet.git] / gmp / Makefile

diff --git a/gmp/Makefile b/gmp/Makefile
index 750dfb6..de36b2d 100644 (file)
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -45,26 +45,27 @@ BUILD_SHARED=no
 endif
 
 boot :: stamp.gmp.static
-all :: gmp.h libgmp.a
-install :: gmp.h libgmp.a
+BINDIST_STAMPS = stamp.gmp.static
 INSTALL_HEADERS += gmp.h
 INSTALL_LIBS += libgmp.a
 
 ifeq "$(BUILD_SHARED)" "yes"
 boot :: stamp.gmp.shared
-all :: libgmp-3.dll libgmp.dll.a
-install :: libgmp-3.dll libgmp.dll.a
+BINDIST_STAMPS += stamp.gmp.shared
 INSTALL_LIBS += libgmp.dll.a
 INSTALL_PROGS += libgmp-3.dll
 endif
 
+install all :: $(INSTALL_HEADERS) $(INSTALL_LIBS) $(INSTALL_PROGS)
+
 stamp.gmp.static:
        $(RM) -rf $(GMP_DIR) gmpbuild
        $(TAR) -zxf $(GMP_TARBALL)
        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)
@@ -99,10 +101,15 @@ libgmp.dll.a: libgmp-3.dll
 endif
 endif
 
+# GMP takes a long time to build, but changes rarely.  Hence we don't
+# bother cleaning it before validating, because that adds a
+# significant overhead to validation.
+ifeq "$(Validating)" "NO"
 clean distclean maintainer-clean ::
        $(RM) -f stamp.gmp.static stamp.gmp.shared
        $(RM) -rf gmpbuild
        $(RM) -rf gmpbuild-shared
+endif
 
 #-----------------------------------------------------------------------------
 #
@@ -111,22 +118,20 @@ clean distclean maintainer-clean ::
 include $(TOP)/mk/target.mk
 
 binary-dist:
-       @:
-ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkGMP)" "YES"
        $(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp
-       touch $(BIN_DIST_DIR)/gmp/$(GMP_TARBALL)
        $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
-ifneq "$(INSTALL_PROGS)" ""
+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
-ifneq "$(INSTALL_LIBS)" ""
+  endif
+  ifneq "$(INSTALL_LIBS)" ""
        $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/
-endif
-ifneq "$(INSTALL_HEADERS)" ""
+  endif
+  ifneq "$(INSTALL_HEADERS)" ""
        $(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/gmp/
-endif
-
-endif
+  endif
+ endif
 endif