[med-svn] [relion] 25/36: d/rules: improve override substvars for gui and bin packages

[Roland Fehrenbacher]

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit 47b5de5becd2bbdf27ec63986e61828f4c7e7e89
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Mon Oct 13 13:38:33 2014 +0000

    d/rules: improve override substvars for gui and bin packages
---
 debian/rules | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 866d595..19c1d09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,11 @@ endif
 # include defs of all DEB_HOST_*/DEB_BUILD_* vars
 include /usr/share/dpkg/architecture.mk
 
-RELION_API_VERSION := $(shell grep 'AC_SUBST.*RELION_API_VERSION' configure.ac \
-  | sed 's/.*\[\(.*\)\])$/\1/g')
+RELION_API_VERSION := $(shell \
+  grep 'AC_SUBST.*RELION_API_VERSION' $(CURDIR)/configure.ac \
+  | sed 's/.*(.*\[\(.*\)\])$$/\1/g')
+$(info Relion API Version = $(RELION_API_VERSION))
+
 CONFIGURE_COMMON := dh_auto_configure -- \
   --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
@@ -51,16 +54,17 @@ override_dh_prep:
 override_dh_auto_install:
 	dh_install
 
+override_dh_shlibdeps: pkgs=relion-gui relion-bin relion-bin-mpi
 override_dh_shlibdeps:
-	dh_shlibdeps
+	dh_shlibdeps -- $(patsubst %,-x%,$(pkgs))
 	# Override substvars for gui and bin packages to make sure they use
 	# the correct lib package
-	for pkg in relion-gui relion-bin relion-bin-mpi; do \
+	for pkg in $(pkgs); do \
 	  mpi=""; [ "$$pkg" = "relion-bin-mpi" ] && mpi="-mpi"; \
-	  echo -e "\n-- Info: Run dpkg-shlibdeps for $$pkg --\n\n"; \
+	  echo -e "\n\n-- Info: Run dpkg-shlibdeps for $$pkg --\n"; \
 	  dpkg-shlibdeps -e debian/$${pkg}/usr/bin/relion_* \
 	    -Sdebian/librelion$${mpi}$(RELION_API_VERSION) \
-	    -T debian/$${pkg}.substvars; \
+	    -Tdebian/$${pkg}.substvars; \
 	done
 
 describe-current-version:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git