소스 검색

pkg/kamailio/deb: set LIBDIR for all rules

* default path to modules was wrong

Fix #1096
Victor Seva 8 년 전
부모
커밋
86c4168d23

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)