shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson.build: make xinitrcdir configurable

Browse Source 
SUSE uses a different xinitrcdir ("/usr/etc/X11/xinit/xinitrc.d").
This commit is contained in:
Franck Bui 2021-03-15 09:43:42 +01:00 committed by Lennart Poettering
parent 4dbcd443d4
commit e62636741c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -144,7 +144,7 @@ pkgconfiglibdir = get_option('pkgconfiglibdir') == '' ? join_paths(libdir, 'pkgc
polkitpolicydir = join_paths(datadir, 'polkit-1/actions') polkitpolicydir = join_paths(datadir, 'polkit-1/actions')
polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d') polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d') polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d') xinitrcdir = get_option('xinitrcdir') == '' ? join_paths(sysconfdir, 'X11/xinit/xinitrc.d') : get_option('xinitrcdir')
rpmmacrosdir = get_option('rpmmacrosdir') rpmmacrosdir = get_option('rpmmacrosdir')
if rpmmacrosdir != 'no' if rpmmacrosdir != 'no'
rpmmacrosdir = join_paths(prefixdir, rpmmacrosdir) rpmmacrosdir = join_paths(prefixdir, rpmmacrosdir)

2
meson_options.txt
View File

@ -178,6 +178,8 @@ option('pkgconfigdatadir', type : 'string', value : '',
description : 'directory for arch-independent pkg-config files') description : 'directory for arch-independent pkg-config files')
option('pkgconfiglibdir', type : 'string', value : '', option('pkgconfiglibdir', type : 'string', value : '',
description : 'directory for standard pkg-config files') description : 'directory for standard pkg-config files')
option('xinitrcdir', type : 'string', value : '',
description : 'directory for xinitrc files')
option('rpmmacrosdir', type : 'string', value : 'lib/rpm/macros.d', option('rpmmacrosdir', type : 'string', value : 'lib/rpm/macros.d',
description : 'directory for rpm macros ["no" disables]') description : 'directory for rpm macros ["no" disables]')
option('pamlibdir', type : 'string', option('pamlibdir', type : 'string',