Browse code

pkg/kamailio/deb: set LIBDIR for all rules

* default path to modules was wrong

Fix #1096

Victor Seva authored on 27/04/2017 17:05:35
Showing 8 changed files
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -43,7 +43,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
43 43
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
44 44
 
45 45
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
46
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
46
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47 47
 
48 48
 # directories with possible duplicate libraries (that should be deleted
49 49
 # from current module* packages)
... ...
@@ -155,7 +155,7 @@ install: build
155 155
 	dh_prep
156 156
 	dh_installdirs
157 157
 	# Add here commands to install the package into debian/kamailio
158
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
158
+	$(MAKE) install group_include="kstandard"
159 159
 	# make group packages
160 160
 	$(call PACKAGE_GRP_INSTALL_template)
161 161
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -43,7 +43,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
43 43
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
44 44
 
45 45
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
46
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
46
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47 47
 
48 48
 # directories with possible duplicate libraries (that should be deleted
49 49
 # from current module* packages)
... ...
@@ -155,7 +155,7 @@ install: build
155 155
 	dh_prep
156 156
 	dh_installdirs
157 157
 	# Add here commands to install the package into debian/kamailio
158
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
158
+	$(MAKE) install group_include="kstandard"
159 159
 	# make group packages
160 160
 	$(call PACKAGE_GRP_INSTALL_template)
161 161
 	$(call PACKAGE_EXTRA_INSTALL_template)
... ...
@@ -44,7 +44,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
44 44
 EXTRA_GROUPS=gzcompress uuid ev jansson http_async
45 45
 
46 46
 # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b)
47
-LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
47
+export LIBDIR ?= lib/$(DEB_HOST_MULTIARCH)
48 48
 
49 49
 # directories with possible duplicate libraries (that should be deleted
50 50
 # from current module* packages)
... ...
@@ -156,7 +156,7 @@ install: build
156 156
 	dh_prep
157 157
 	dh_installdirs
158 158
 	# Add here commands to install the package into debian/kamailio
159
-	$(MAKE) install LIBDIR=$(LIBDIR) group_include="kstandard"
159
+	$(MAKE) install group_include="kstandard"
160 160
 	# make group packages
161 161
 	$(call PACKAGE_GRP_INSTALL_template)
162 162
 	$(call PACKAGE_EXTRA_INSTALL_template)