[cminpack] 01/01: Fix FTBS on several platforms

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cminpack.

commit f8037e936755732e30527451a6214ac820287d37
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu May 29 10:09:47 2014 +0200

    Fix FTBS on several platforms
---
 debian/changelog               | 6 ++++++
 debian/patches/fix_tests.patch | 5 +++--
 debian/rules                   | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9507bf5..8b93dc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cminpack (1.3.4-2) unstable; urgency=low
+
+  * Fix FTBS on several platforms
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 29 May 2014 10:01:08 +0200
+
 cminpack (1.3.4-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix_tests.patch b/debian/patches/fix_tests.patch
index a2ba98e..aeb6ac7 100644
--- a/debian/patches/fix_tests.patch
+++ b/debian/patches/fix_tests.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use system provided environment when building the test suite
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -10,10 +10,11 @@
+@@ -10,10 +10,12 @@
  #F77CFLAGS=-g
  
  # uncomment the following for C MINPACK
@@ -14,7 +14,8 @@ Description: Use system provided environment when building the test suite
 +#CC=gcc
 +#CFLAGS=-g -Wall
 +CPPFLAGS+=-I..
-+LDADD+=-L../obj-$(DEB_HOST_MULTIARCH) -lcminpack -Wl,-rpath -Wl,../obj-$(DEB_HOST_MULTIARCH)
++LIBPATH=$(shell echo ../obj-*)
++LDADD+=-L$(LIBPATH) -lcminpack -Wl,-rpath -Wl,$(LIBPATH)
  
  FMINPACK=../fortran/libminpack.a
  
diff --git a/debian/rules b/debian/rules
index e422591..49caa6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,11 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
 override_dh_auto_test:
-	make -C examples ctest
+	$(MAKE) -C examples ctest
 
 override_dh_clean:
 	dh_clean
-	make -C examples clean
+	$(MAKE) -C examples clean
 
 get-orig-source:
 	uscan --verbose --force-download --repack --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cminpack.git