From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Mon, 1 Jul 2024 12:04:46 +0000 (+0200)
Subject: autotools: make pam install path configurable
X-Git-Tag: v2.42-start~283^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c03e75c0b837f4285bd34f08eae40b48d3378be;p=thirdparty%2Futil-linux.git

autotools: make pam install path configurable

While at it, also move the initial definition of
usesecurelib_exec_LTLIBRARIES into Makefile.am.
Also add "exec" to the target name which is recognized by automake to
mark the targets as architecture-specific.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/Makefile.am b/Makefile.am
index 01a35d15c..1b7fb1463 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ usrsbin_exec_PROGRAMS =
 man_MANS =
 pkgconfig_DATA =
 usrlib_exec_LTLIBRARIES =
+usrsecurelib_exec_LTLIBRARIES =
 bin_PROGRAMS =
 sbin_PROGRAMS =
 dist_usrbin_exec_SCRIPTS =
diff --git a/configure.ac b/configure.ac
index c7fe78976..f9812cb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,9 @@ AS_CASE([$libdir],
 )
 AC_SUBST([usrlib_execdir])
 
+usrsecurelib_execdir='${usrlib_execdir}/security'
+AC_SUBST([usrsecurelib_execdir])
+
 # static configuration maintained by packages (e.g. /usr/lib)
 AC_ARG_VAR([SYSCONFSTATICDIR],
 	   [Path to static system configuration, default ${prefix}/lib])
diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am
index bc932c4f2..e59bcb9d7 100644
--- a/pam_lastlog2/src/Makemodule.am
+++ b/pam_lastlog2/src/Makemodule.am
@@ -1,5 +1,4 @@
-securelibdir = $(libdir)/security
-securelib_LTLIBRARIES = pam_lastlog2.la
+usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la
 
 pam_lastlog2_la_SOURCES = \
 	pam_lastlog2/src/pam_lastlog2.c