[libfann] 20/34: d/rules: Update for CMake build

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 8b1c2bf43999d2118707484229c511be8cba55dd
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:35:16 2015 +0200

    d/rules: Update for CMake build
---
 debian/rules | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4cfc2f2..208ec7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,24 +4,22 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These get included in the build flags by debhelper
-export DEB_CFLAGS_MAINT_APPEND = -Wall
 
 # For get-orig-source
 PKGDIR := $(dir $(firstword $(MAKEFILE_LIST)))..
 UPVER := $(shell dpkg-parsechangelog -l$(PKGDIR)/debian/changelog -S Version | \
 		sed -re 's/\+ds-.*//')
 
-%:
-	dh $@ --with autoreconf
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_CFLAGS_MAINT_APPEND = -Wall
 
 
-override_dh_autoreconf:
-	dh_autoreconf --as-needed
+%:
+	dh $@
 
 
 override_dh_auto_configure-arch:
-	dh_auto_configure
+	dh_auto_configure -- -DLIB_SUFFIX=/${DEB_HOST_MULTIARCH}
 
 
 override_dh_auto_configure-indep:
@@ -45,8 +43,8 @@ override_dh_auto_test-arch:
 	testrundir=$$(mktemp -d) ;\
 		ADTTMP=$$testrundir \
 		CPATH=$(CURDIR)/src/include \
-		LIBRARY_PATH=$(CURDIR)/src/.libs \
-		LD_LIBRARY_PATH=$(CURDIR)/src/.libs \
+		LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_MULTIARCH)/src/ \
+		LD_LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_MULTIARCH)/src/ \
 	/bin/sh $(CURDIR)/debian/tests/build ;\
 	res=$$? ;\
 	rm -rf "$$testrundir" ;\
@@ -60,10 +58,6 @@ override_dh_auto_test-indep:
 override_dh_auto_install-arch:
 	# Library
 	dh_auto_install
-	
-	# Clear .la dependency_libs as required by Policy 10.2
-	sed -i -e "s/dependency_libs='.*'/dependency_libs=''/" \
-		debian/tmp/usr/lib/*/*.la
 
 
 override_dh_auto_install-indep:

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