diff options
| author | Thorsten Kukuk <kukuk@suse.com> | 2024-09-12 11:32:06 +0200 |
|---|---|---|
| committer | Thorsten Kukuk <5908016+thkukuk@users.noreply.github.com> | 2024-09-12 17:32:47 +0200 |
| commit | a2de804e56618b839966120dae012f3c8d7aef82 (patch) | |
| tree | 5586beb3cb1d71109522a6bf6dd782dbaee58a4c | |
| parent | cce619f09baf6247b32562f99497f4661068249e (diff) | |
| download | pam-a2de804e56618b839966120dae012f3c8d7aef82.tar.gz pam-a2de804e56618b839966120dae012f3c8d7aef82.tar.bz2 pam-a2de804e56618b839966120dae012f3c8d7aef82.zip | |
pam_env: install environment file in vendordir
If vendordir is enabled, the distribution provided configuration files
should be below this directory and not in /etc.
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | modules/module-meson.build | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 107fe1d1..840ff74f 100644 --- a/meson.build +++ b/meson.build @@ -83,10 +83,12 @@ cdata.set('SCONFIGDIR', sconfigdir) vendordir = get_option('vendordir') if get_option('vendordir') == '' vendor_sconfigdir = sconfigdir + vendor_sysconfdir = sysconfdir stringparam_vendordir = [] stringparam_profileconditions = 'without_vendordir' else vendor_sconfigdir = vendordir / 'security' + vendor_sysconfdir = vendordir cdata.set_quoted('VENDORDIR', vendordir) cdata.set_quoted('VENDOR_SCONFIG_DIR', vendor_sconfigdir) stringparam_vendordir = ['--stringparam', 'vendordir', vendordir] diff --git a/modules/module-meson.build b/modules/module-meson.build index 3804221e..acb70875 100644 --- a/modules/module-meson.build +++ b/modules/module-meson.build @@ -268,7 +268,7 @@ if module == 'pam_env' ) install_data( 'environment', - install_dir: sysconfdir, + install_dir: vendor_sysconfdir, install_tag: 'config', ) endif |