lastlog2: Fix various issues with meson

- Make sure @usrbin_execdir@ is actually replaced
- pam_lastlog2.so is always a shared library that's dlopen()ed,
  so use shared_module and do not generate a pkgconfig module

diff --git a/meson.build b/meson.build
index 10d808b5ee5b198f5bfaf8955b16888ece158879..507045d8103feef3a1d1e637aee77311a9b679f0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -62,6 +62,7 @@ conf.set('bindir', bindir)
 conf.set('sbindir', sbindir)
 conf.set('runstatedir', runstatedir)
 conf.set('sysconfdir', sysconfdir)
+conf.set('usrbin_execdir', usrbin_exec_dir)
 conf.set('usrsbin_execdir', usrsbin_exec_dir)
 conf.set('docdir', docdir)
 conf.set_quoted('_PATH_SYSCONFSTATICDIR', sysconfstaticdir)

diff --git a/pam_lastlog2/meson.build b/pam_lastlog2/meson.build
index d662e1b3f215d4e78610fd074db67bd8a0920fe7..12f3a6b211e614bf37241f2f160da3a913b5b272 100644 (file)
--- a/pam_lastlog2/meson.build
+++ b/pam_lastlog2/meson.build
@@ -21,7 +21,7 @@ if build_pam_lastlog2
 
   libpam = cc.find_library('pam')
 
-  pam_lastlog2 = both_libraries(
+  pam_lastlog2 = shared_module(
     'pam_lastlog2',
     lib_pam_lastlog2_sources,
     name_prefix : '',
@@ -31,14 +31,6 @@ if build_pam_lastlog2
     dependencies : [libpam, lastlog2_dep],
     install : build_liblastlog2,
     install_dir : pamlibdir,
-    version : liblastlog2_version,
   )
   manadocs += ['pam_lastlog2/man/pam_lastlog2.8.adoc']
-
-  pkg.generate(
-    pam_lastlog2,
-    description : 'pam library to manage last login data with lastlog2',
-    subdirs : 'lastlog2',
-    version : pc_version
-  )
 endif