[Pkg-scicomp-commits] gmp/trunk/debian

[Steven Michael Robbins]

SVN commit 4344 by smr:

Install generated gmp.h with arch-based suffix; install a static gmp.h that dispatches based on architecture type.

 M  +1 -1      gmp/trunk/debian/changelog  
 A             gmp/trunk/debian/fix-gmp-h.sh  
 A             gmp/trunk/debian/gmp.h   [License: UNKNOWN]
 M  +7 -1      gmp/trunk/debian/rules  


--- gmp/trunk/debian/changelog #4343:4344
@@ -5,7 +5,7 @@
   
   * control: Standards-Version 3.8.1; no changes.
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 31 Mar 2009 21:05:02 -0500
+ -- Steve M. Robbins <smr at debian.org>  Thu, 02 Apr 2009 22:57:14 -0500
 
 gmp (2:4.2.4+dfsg-4) experimental; urgency=low
 
--- gmp/trunk/debian/rules #4343:4344
@@ -106,7 +106,8 @@
 	mkdir -p build
 	cd build && ../configure $(confflags) \
 	    AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" \
-	    CXX="$(DEB_HOST_GNU_TYPE)-g++" CXXFLAGS="$(CXXFLAGS)" 
+	    CXX="$(DEB_HOST_GNU_TYPE)-g++" CXXFLAGS="$(CXXFLAGS)"
+	CC="$(DEB_HOST_GNU_TYPE)-gcc" sh debian/fix-gmp-h.sh build
 	touch $@
 
 configure32: patch configure32-stamp
@@ -115,6 +116,7 @@
 	cd build32 && ../configure $(confflags32) \
 	    AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m32)" CFLAGS="$(CFLAGS)" \
 	    CXX="$(DEB_HOST_GNU_TYPE)-g++ $(m32)" CXXFLAGS="$(CXXFLAGS)" 
+	CC="$(DEB_HOST_GNU_TYPE)-gcc ${m32}" sh debian/fix-gmp-h.sh build32
 	touch $@
 
 configure64: patch configure64-stamp
@@ -123,6 +125,7 @@
 	cd build64 && ../configure $(confflags64) \
 	    AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc $(m64)" CFLAGS="$(CFLAGS)" \
 	    CXX="$(DEB_HOST_GNU_TYPE)-g++ $(m64)" CXXFLAGS="$(CXXFLAGS)" 
+	CC="$(DEB_HOST_GNU_TYPE)-gcc ${m64}" sh debian/fix-gmp-h.sh build64
 	touch $@
 
 build: build-stamp
@@ -172,6 +175,7 @@
 	dh_install -plibgmp3-dev usr/lib/lib*.a
 	dh_install -plibgmp3-dev usr/lib/lib*.la
 	dh_install -plibgmp3-dev usr/include
+	dh_install -plibgmp3-dev -Xgmp-mparam.h build/gmp*.h usr/include
 
 	# Install upstream ChangeLog, AUTHORS, NEWS, and README only in -dev package
 	dh_installchangelogs -plibgmp3-dev
@@ -188,6 +192,7 @@
 	dh_install -plib32gmp3-dev ${lib32dir}/lib*.so
 	dh_install -plib32gmp3-dev ${lib32dir}/lib*.a
 	dh_install -plib32gmp3-dev ${lib32dir}/lib*.la
+	dh_install -plib32gmp3-dev -Xgmp-mparam.h -Xgmp.h build32/gmp*.h usr/include
 
 install64: build64-stamp install-prep
 	$(MAKE) DESTDIR=`pwd`/debian/tmp -C build64 install
@@ -200,6 +205,7 @@
 	dh_install -plib64gmp3-dev ${lib64dir}/lib*.so
 	dh_install -plib64gmp3-dev ${lib64dir}/lib*.a
 	dh_install -plib64gmp3-dev ${lib64dir}/lib*.la
+	dh_install -plib64gmp3-dev -Xgmp-mparam.h -Xgmp.h build64/gmp*.h usr/include
 
 
 # This single target is used to build all the packages, all at once, or