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>
(cherry picked from commit 8c03e75c0b837f4285bd34f08eae40b48d3378be)

diff --git a/Makefile.am b/Makefile.am
index 50ab8d0afec8ae00574e7ee0d1222ea082bd50fa..b4475a4e53c7fb747e74850c8c062d7ebd78eddb 100644 (file)
--- 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 23594ff23f7a79c87c5cda81b2d4827f576acf6e..e8d8878cd262d242fedc3f4d8110e3b43c4293a1 100644 (file)
--- 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 maintaned 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 f9a9b6b41fb3316ebe0bd9f3cf63056726d6308c..6d2365378e8665d87d8c5ee4696c3694965569d8 100644 (file)
--- 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