From: Karel Zak <kzak@redhat.com>
Date: Tue, 27 Aug 2024 10:00:21 +0000 (+0200)
Subject: autotools: fix securedir and pam_lastlog2 install
X-Git-Tag: v2.42-start~222^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c787eaac43f5f01146f792b0239f587e4b81202;p=thirdparty%2Futil-linux.git

autotools: fix securedir and pam_lastlog2 install

Addresses: https://github.com/util-linux/util-linux/pull/3173
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index c65af865c..44d000e78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ usrsbin_exec_PROGRAMS =
 man_MANS =
 pkgconfig_DATA =
 usrlib_exec_LTLIBRARIES =
-usrsecurelib_exec_LTLIBRARIES =
+securelib_exec_LTLIBRARIES =
 bin_PROGRAMS =
 sbin_PROGRAMS =
 dist_usrbin_exec_SCRIPTS =
@@ -155,11 +155,11 @@ EXTRA_DIST += \
 # pylibmountexec module must be installed after usrlib_exec libraries,
 # otherwise the libtool relink step will fail to find libmount.la and
 # will try -lmount which is possibly not available.
-# The same for usrsecurelib_exec and liblastlog2.la
+# The same for securelib_exec and liblastlog2.la
 #
 # So introduce this dependency rule:
 # install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
-# install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
+# install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
 @verbatim_extra_dependency@
 
 #
diff --git a/configure.ac b/configure.ac
index dfff0e819..6d3976d30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,8 +120,8 @@ AS_CASE([$libdir],
 )
 AC_SUBST([usrlib_execdir])
 
-usrsecurelib_execdir='${usrlib_execdir}/security'
-AC_SUBST([usrsecurelib_execdir])
+securelib_execdir='${libdir}/security'
+AC_SUBST([securelib_execdir])
 
 # static configuration maintained by packages (e.g. /usr/lib)
 AC_ARG_VAR([SYSCONFSTATICDIR],
@@ -2796,7 +2796,7 @@ verbatim_extra_dependency='
 # otherwise the libtool relink step will fail to find libmount.la and
 # will try -lmount which is possibly not available.
 install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
-install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
+install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
 
 '
 AC_SUBST([verbatim_extra_dependency])
diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am
index e59bcb9d7..40d597c58 100644
--- a/pam_lastlog2/src/Makemodule.am
+++ b/pam_lastlog2/src/Makemodule.am
@@ -1,4 +1,4 @@
-usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la
+securelib_exec_LTLIBRARIES += pam_lastlog2.la
 
 pam_lastlog2_la_SOURCES = \
 	pam_lastlog2/src/pam_lastlog2.c