From 7c08028697c3f78dbfba288e3ba3b076b994ec66 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 7 Feb 2024 11:29:26 +0100 Subject: [PATCH] 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 --- meson.build | 1 + pam_lastlog2/meson.build | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 10d808b5ee..507045d810 100644 --- 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 d662e1b3f2..12f3a6b211 100644 --- 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 -- 2.47.3