From: Maciek Borzecki <maciek.borzecki@gmail.com>
Date: Tue, 20 Sep 2016 19:24:45 +0000 (+0200)
Subject: nss: install nss modules to ${rootlibdir}
X-Git-Tag: v232~190^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af0a10bfa1a4f73195575681c215ff43183ae4b4;p=thirdparty%2Fsystemd.git

nss: install nss modules to ${rootlibdir}

NSS modules (libnss_*.so.*) need to be installed into
${rootlibdir} (typically /lib) in order to be used. Previously, the
modules were installed into ${libdir}, thus usually ending up in
/usr/lib, even on systems where split usr is enabled, or ${libdir} is
passed explicitly.

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index 946af196f31..ed146108930 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,6 +157,7 @@ nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
 endif
 udevlibexec_PROGRAMS =
 gperf_gperf_sources =
+rootlib_LTLIBRARIES =
 
 in_files = $(filter %.in,$(EXTRA_DIST))
 in_in_files = $(filter %.in.in, $(in_files))
@@ -5056,7 +5057,7 @@ libnss_systemd_la_LIBADD = \
 	libsystemd-internal.la \
 	libbasic.la
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libnss_systemd.la
 
 # ------------------------------------------------------------------------------
@@ -5078,7 +5079,7 @@ libnss_myhostname_la_LIBADD = \
 	libsystemd-internal.la \
 	libbasic.la
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
@@ -5177,7 +5178,7 @@ libnss_mymachines_la_LIBADD = \
 	libsystemd-internal.la \
 	libbasic.la
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libnss_mymachines.la
 
 endif
@@ -5476,7 +5477,7 @@ libnss_resolve_la_LIBADD = \
 	libbasic.la \
         -ldl
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libnss_resolve.la
 
 systemd_resolve_SOURCES = \