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 01a35d15c53b9a6db4861e5f4b4b270aa0e633bb..1b7fb14637fc6d643c5989cb20b29c903109c503 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 c7fe78976e88e5af8574aa7a0ff1d32fbcf98672..f9812cb062344fdede86101d0541b431a17e0009 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 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 bc932c4f2203f69736661e9fcdb16117373f4165..e59bcb9d71c411e615aa2d7c737df8c4bac04d8e 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