netdata/packaging: Align libdir in all configure commands (#6682)
* netdata/packaging: Align libdir with the one we expect our installation to use, following the rest of the directory correllations * netdata/packaging:[ci skip] One more
Paul Emm. Katsoulakis committed
Aug 16, 2019 at 22:19 UTC
dac249d3d13bfed73daa83e408efe0f1d490b5b1
4 files changed
+5
-2
.travis/package_management/common.py
+1
-1
@@ -147,7 +147,7 @@ def prepare_version_source(dest_archive, pkg_friendly_version, tag=None):
147
run_command_in_host(['autoreconf', '-ivf'])
148
149
print(".4 Run configure")
150
- run_command_in_host(['./configure', '--prefix=/usr', '--sysconfdir=/etc', '--localstatedir=/var', '--libexecdir=/usr/libexec', '--with-math', '--with-zlib', '--with-user=netdata'])
150
+ run_command_in_host(['./configure', '--prefix=/usr', '--sysconfdir=/etc', '--localstatedir=/var', '--libdir=/usr/lib', '--libexecdir=/usr/libexec', '--with-math', '--with-zlib', '--with-user=netdata'])
151
152
print(".5 Run make dist")
153
run_command_in_host(['make', 'dist'])
contrib/debian/rules
+1
-1
@@ -18,7 +18,7 @@ TOP = $(CURDIR)/debian/netdata
18
19
override_dh_auto_configure:
20
autoreconf -ivf
21
- dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
21
+ dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
22
--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www
23
24
debian/%.postinst: debian/%.postinst.in
netdata-installer.sh
+1
@@ -400,6 +400,7 @@ run ./configure \
400
--sysconfdir="${NETDATA_PREFIX}/etc" \
401
--localstatedir="${NETDATA_PREFIX}/var" \
402
--libexecdir="${NETDATA_PREFIX}/usr/libexec" \
403
+ --libdir="${NETDATA_PREFIX}/usr/lib" \
404
--with-zlib \
405
--with-math \
406
--with-user=netdata \
netdata.spec.in
+2
@@ -11,6 +11,7 @@
11
%define _sysconfdir /etc
12
%define _localstatedir /var
13
%define _libexecdir /usr/libexec
14
+%define _libdir /usr/lib
15
16
#
17
# Conditional build:
@@ -235,6 +236,7 @@ autoreconf -ivf
236
--sysconfdir="%{_sysconfdir}" \
237
--localstatedir="%{_localstatedir}" \
238
--libexecdir="%{_libexecdir}" \
239
+ --libdir="%{_libdir}" \
240
--with-zlib \
241
--with-math \
242
--with-user=netdata \