[Pkg-voip-commits] [kamailio] 09/10: set LIBDIR for all rules

[Victor Seva]

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

vseva pushed a commit to branch master
in repository kamailio.

commit a56ccda6315e97158ef2e8cb7edc12a9dba7cbe9
Author: Victor Seva <vseva at debian.org>
Date:   Mon Jun 19 09:04:07 2017 +0200

    set LIBDIR for all rules
    
    - default path to modules was wrong
---
 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 03d0cd5..f53242e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ ifeq ($(DEB_HOST_ARCH),powerpcspe)
 endif
 
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
 
 # directories with possible duplicate libraries (that should be deleted
 # from current module* packages)
@@ -84,7 +84,7 @@ endef
 
 define PACKAGE_GRP_INSTALL_template
 	$(foreach grp,$(PACKAGE_GROUPS),\
-		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		$(MAKE) install-modules-all group_include="k$(grp)" \
 		BASEDIR=$(CURDIR)/debian/kamailio-$(grp)-modules \
 		cfg_prefix=$(CURDIR)/debian/kamailio-$(grp)-modules \
 		doc-dir=share/doc/kamailio-$(grp)-modules quiet=verbose
@@ -109,7 +109,7 @@ endef
 
 define PACKAGE_EXTRA_INSTALL_template
 	$(foreach grp,$(EXTRA_GROUPS),\
-		$(MAKE) install-modules-all LIBDIR=$(LIBDIR) group_include="k$(grp)" \
+		$(MAKE) install-modules-all group_include="k$(grp)" \
 		BASEDIR=$(CURDIR)/debian/kamailio-extra-modules \
 		cfg_prefix=$(CURDIR)/debian/kamailio-extra-modules \
 		doc-dir=share/doc/kamailio-extra-modules quiet=verbose
@@ -185,7 +185,7 @@ install: build
 	dh_prep
 	dh_installdirs
 	# Add here commands to install the package into debian/kamailio
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
+	$(MAKE) install group_include="kstandard"
 	# make group packages
 	$(call PACKAGE_GRP_INSTALL_template)
 	$(call PACKAGE_EXTRA_INSTALL_template)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git