From dac249d3d13bfed73daa83e408efe0f1d490b5b1 Mon Sep 17 00:00:00 2001
From: "Paul Emm. Katsoulakis"
 <34388743+paulkatsoulakis@users.noreply.github.com>
Date: Fri, 16 Aug 2019 22:19:09 +0300
Subject: [PATCH] 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
---
 .travis/package_management/common.py | 2 +-
 contrib/debian/rules                 | 2 +-
 netdata-installer.sh                 | 1 +
 netdata.spec.in                      | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis/package_management/common.py b/.travis/package_management/common.py
index 58c999f216..a72fe48376 100755
--- a/.travis/package_management/common.py
+++ b/.travis/package_management/common.py
@@ -147,7 +147,7 @@ def prepare_version_source(dest_archive, pkg_friendly_version, tag=None):
     run_command_in_host(['autoreconf', '-ivf'])
 
     print(".4 Run configure")
-    run_command_in_host(['./configure', '--prefix=/usr', '--sysconfdir=/etc', '--localstatedir=/var', '--libexecdir=/usr/libexec', '--with-math', '--with-zlib', '--with-user=netdata'])
+    run_command_in_host(['./configure', '--prefix=/usr', '--sysconfdir=/etc', '--localstatedir=/var', '--libdir=/usr/lib', '--libexecdir=/usr/libexec', '--with-math', '--with-zlib', '--with-user=netdata'])
 
     print(".5 Run make dist")
     run_command_in_host(['make', 'dist'])
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 1898a1391a..036e0108e6 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -18,7 +18,7 @@ TOP = $(CURDIR)/debian/netdata
 
 override_dh_auto_configure:
 	autoreconf -ivf
-	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
 	--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www
 
 debian/%.postinst: debian/%.postinst.in
diff --git a/netdata-installer.sh b/netdata-installer.sh
index e749a867af..781cd9b1d9 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -400,6 +400,7 @@ run ./configure \
 	--sysconfdir="${NETDATA_PREFIX}/etc" \
 	--localstatedir="${NETDATA_PREFIX}/var" \
 	--libexecdir="${NETDATA_PREFIX}/usr/libexec" \
+	--libdir="${NETDATA_PREFIX}/usr/lib" \
 	--with-zlib \
 	--with-math \
 	--with-user=netdata \
diff --git a/netdata.spec.in b/netdata.spec.in
index cb65133f0d..8b77387f72 100644
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -11,6 +11,7 @@
 %define _sysconfdir /etc
 %define _localstatedir /var
 %define _libexecdir /usr/libexec
+%define _libdir /usr/lib
 
 #
 # Conditional build:
@@ -235,6 +236,7 @@ autoreconf -ivf
 	--sysconfdir="%{_sysconfdir}" \
 	--localstatedir="%{_localstatedir}" \
 	--libexecdir="%{_libexecdir}" \
+        --libdir="%{_libdir}" \
 	--with-zlib \
 	--with-math \
 	--with-user=netdata \