From: Yu Watanabe Date: Thu, 23 Nov 2017 13:20:22 +0000 (+0900) Subject: meson: do not install RPM macros if rpmmacrosdir is set to no (#7430) X-Git-Tag: v236~141 X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=8a38aac3a7d14463abab3bfa1430ef4e318078cb;p=systemd%2F.git meson: do not install RPM macros if rpmmacrosdir is set to no (#7430) Fixes #7427. --- diff --git a/meson.build b/meson.build index 6317847663..fd38923b0d 100644 --- 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