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

diff --git a/gmp/Makefile b/gmp/Makefile
index b3b8104..78cb570 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -34,9 +34,13 @@ PLATFORM := $(shell echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g')
 # follow, as it isn't used consistently. Instead we put an ln.bat in
 # path that always fails.
 
+# We use a tarball like gmp-4.2.1-nodoc.tar.gz, which is
+# gmp-4.2.1.tar.gz repacked without the doc/ directory contents.
+# That's because the doc/ directory contents are under the GFDL,
+# which causes problems for Debian.
+
 GMP_TARBALL := $(firstword $(wildcard gmp*.tar.gz))
-GMP_DIR := $(subst .tar.gz,,$(GMP_TARBALL))
-BMP_BUILD_DIR := build
+GMP_DIR := $(subst -nodoc.tar.gz,,$(GMP_TARBALL))
 
 ifeq "$(findstring dyn, $(GhcRTSWays))" "dyn"
 BUILD_SHARED=yes
@@ -44,19 +48,17 @@ else
 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 +66,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 +79,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)
@@ -115,20 +119,9 @@ endif
 
 include $(TOP)/mk/target.mk
 
-binary-dist:
-	$(INSTALL_DIR)                         $(BIN_DIST_DIR)/gmp
-	$(INSTALL_DATA)    Makefile            $(BIN_DIST_DIR)/gmp/
-ifneq "$(HaveLibGmp)" "YES"
- ifneq "$(HaveFrameworkGMP)" "YES"
-  ifneq "$(INSTALL_PROGS)" ""
-	$(INSTALL_DATA)    $(INSTALL_PROGS)    $(BIN_DIST_DIR)/gmp/
-  endif
-  ifneq "$(INSTALL_LIBS)" ""
-	$(INSTALL_DATA)    $(INSTALL_LIBS)     $(BIN_DIST_DIR)/gmp/
-  endif
-  ifneq "$(INSTALL_HEADERS)" ""
-	$(INSTALL_HEADER)  $(INSTALL_HEADERS)  $(BIN_DIST_DIR)/gmp/
-  endif
- endif
-endif
+BINDIST_EXTRAS += $(BINDIST_STAMPS)
+BINDIST_EXTRAS += $(INSTALL_PROGS)
+BINDIST_EXTRAS += $(INSTALL_LIBS)
+BINDIST_EXTRAS += $(INSTALL_HEADERS)
+include $(TOP)/mk/bindist.mk