From 86c4168d2306b6648cdaaaa0540ece154d959727 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 27 Apr 2017 19:05:35 +0200 Subject: [PATCH] pkg/kamailio/deb: set LIBDIR for all rules * default path to modules was wrong Fix #1096 --- pkg/kamailio/deb/debian/rules | 4 ++-- pkg/kamailio/deb/jessie/rules | 4 ++-- pkg/kamailio/deb/precise/rules | 4 ++-- pkg/kamailio/deb/sid/rules | 4 ++-- pkg/kamailio/deb/stretch/rules | 4 ++-- pkg/kamailio/deb/trusty/rules | 4 ++-- pkg/kamailio/deb/wheezy/rules | 4 ++-- pkg/kamailio/deb/xenial/rules | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index b6f212e1934..7319a6c6120 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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) diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index cf06e1cde8f..51fbf6033f9 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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) diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index be000578365..2a1920ba832 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -43,7 +43,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -155,7 +155,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) diff --git a/pkg/kamailio/deb/sid/rules b/pkg/kamailio/deb/sid/rules index 4f3c0fca6b9..53e7361fa1a 100755 --- a/pkg/kamailio/deb/sid/rules +++ b/pkg/kamailio/deb/sid/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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) diff --git a/pkg/kamailio/deb/stretch/rules b/pkg/kamailio/deb/stretch/rules index 4f3c0fca6b9..53e7361fa1a 100755 --- a/pkg/kamailio/deb/stretch/rules +++ b/pkg/kamailio/deb/stretch/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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) diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index 82dec480eeb..f547e3445fb 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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) diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index be000578365..2a1920ba832 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -43,7 +43,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -155,7 +155,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) diff --git a/pkg/kamailio/deb/xenial/rules b/pkg/kamailio/deb/xenial/rules index b6f212e1934..7319a6c6120 100755 --- a/pkg/kamailio/deb/xenial/rules +++ b/pkg/kamailio/deb/xenial/rules @@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ EXTRA_GROUPS=gzcompress uuid ev jansson http_async # 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) @@ -156,7 +156,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)