shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: do not install RPM macros if rpmmacrosdir is set to no (#7430)

Browse Source 
Fixes #7427.
This commit is contained in:
Yu Watanabe 2017-11-23 22:20:22 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 71050acb68
commit 8a38aac3a7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -94,7 +94,10 @@ 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')
varlogdir = join_paths(localstatedir, 'log') varlogdir = join_paths(localstatedir, 'log')
xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d') xinitrcdir = join_paths(sysconfdir, 'X11/xinit/xinitrc.d')
rpmmacrosdir = join_paths(prefixdir, get_option('rpmmacrosdir')) rpmmacrosdir = get_option('rpmmacrosdir')
if rpmmacrosdir != 'no'
rpmmacrosdir = join_paths(prefixdir, rpmmacrosdir)
endif
modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d') modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
# Our own paths # Our own paths