FIX BUILD `set -o igncr'-issue on FreeBSD

[ghc-hetmet.git] / gmp / Makefile

diff --git a/gmp/Makefile b/gmp/Makefile
index 9822ead..750dfb6 100644 (file)
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -12,10 +12,13 @@ include $(TOP)/mk/boilerplate.mk
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkGMP)" "YES"
 
-boot :: stamp.gmp.static
-
 PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 
+# 2007-09-26
+#     set -o igncr 
+# is not a valid command on non-Cygwin-systems.
+# Let it fail silently instead of aborting the build.
+#
 # 2007-07-05
 # We do
 #     set -o igncr; export SHELLOPTS
@@ -41,12 +44,26 @@ else
 BUILD_SHARED=no
 endif
 
+boot :: stamp.gmp.static
+all :: gmp.h libgmp.a
+install :: gmp.h libgmp.a
+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
+INSTALL_LIBS += libgmp.dll.a
+INSTALL_PROGS += libgmp-3.dll
+endif
+
 stamp.gmp.static:
        $(RM) -rf $(GMP_DIR) gmpbuild
        $(TAR) -zxf $(GMP_TARBALL)
        mv $(GMP_DIR) gmpbuild
        chmod +x ln
-       set -o igncr; export SHELLOPTS; \
+       (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
            export PATH=`pwd`:$$PATH; \
            cd gmpbuild && \
            CC=$(WhatGccIsCalled) $(SHELL) configure \
@@ -58,39 +75,27 @@ stamp.gmp.shared:
        $(TAR) -zxf $(GMP_TARBALL)
        mv $(GMP_DIR) gmpbuild-shared
        chmod +x ln
-       set -o igncr; export SHELLOPTS; \
+       (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
            export PATH=`pwd`:$$PATH; \
            cd gmpbuild-shared && \
            CC=$(WhatGccIsCalled) $(SHELL) configure \
                  --enable-shared=yes --disable-static --host=$(PLATFORM) --build=$(PLATFORM)
        touch $@
 
+gmp.h: stamp.gmp.static
+       $(CP) gmpbuild/gmp.h .
+
 libgmp.a: stamp.gmp.static
        $(MAKE) -C gmpbuild MAKEFLAGS=
        $(CP) gmpbuild/.libs/libgmp.a .
        $(RANLIB) libgmp.a
 
-all :: libgmp.a
-
-install :: libgmp.a
-
-INSTALL_LIBS += gmpbuild/libgmp.a
-
-ifeq "$(BUILD_SHARED)" "yes"
 libgmp-3.dll: stamp.gmp.shared
        $(MAKE) -C gmpbuild-shared MAKEFLAGS=
        $(CP) gmpbuild-shared/.libs/libgmp-3.dll .
 
 libgmp.dll.a: libgmp-3.dll
        $(CP) gmpbuild-shared/.libs/libgmp.dll.a .
-
-all :: libgmp-3.dll libgmp.dll.a
-
-install :: libgmp-3.dll libgmp.dll.a
-
-INSTALL_LIBS += libgmp.dll.a
-INSTALL_PROGS += libgmp-3.dll
-endif
 endif
 endif
 
@@ -110,14 +115,16 @@ binary-dist:
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkGMP)" "YES"
        $(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp
-       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp/gmpbuild
        touch $(BIN_DIST_DIR)/gmp/$(GMP_TARBALL)
        $(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
 ifneq "$(INSTALL_PROGS)" ""
-       $(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/gmpbuild/
+       $(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/
 endif
 ifneq "$(INSTALL_LIBS)" ""
-       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/gmpbuild/
+       $(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/
+endif
+ifneq "$(INSTALL_HEADERS)" ""
+       $(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/gmp/
 endif
 
 endif