projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71050ac
)
meson: do not install RPM macros if rpmmacrosdir is set to no (#7430)
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Thu, 23 Nov 2017 13:20:22 +0000
(22:20 +0900)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Thu, 23 Nov 2017 13:20:22 +0000
(14:20 +0100)
Fixes #7427.
meson.build
patch
|
blob
|
history
diff --git
a/meson.build
b/meson.build
index 6317847663db482fce9322f69da92d4ee1e3b61d..fd38923b0db2464bb580c6c22a2d427c81a3ab7a 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-94,7
+94,10
@@
polkitrulesdir = join_paths(datadir, 'polkit-1/rules.d')
polkitpkladir = join_paths(localstatedir, 'lib/polkit-1/localauthority/10-vendor.d')
varlogdir = join_paths(localstatedir, 'log')
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')
# Our own paths