archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-17 11:12:42 +00:00
Code Issues Projects Releases Wiki Activity

netdata/packaging: Align libdir in all configure commands ()

Browse source 
* 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
This commit is contained in:
Paul Emm. Katsoulakis 2019-08-16 22:19:09 +03:00 • committed by GitHub
parent 4a9deb161a
commit dac249d3d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
.travis/package_management
common.py
contrib/debian
rules
netdata-installer.shnetdata.spec.in

2
.travis/package_management/common.py
View file

@ -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'])

2
contrib/debian/rules
View file

@ -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

1
netdata-installer.sh
View file

@ -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 \

2
netdata.spec.in
View file

@ -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 \