From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 19 May 2018 15:02:37 +0000 (+0200)
Subject: rpm: add macros for common configuration dirs
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=18b586d62b52299ca6a88ff8a5997c5ca767dcdc;p=elogind.git

rpm: add macros for common configuration dirs

%_environmnentdir /usr/lib/environment.d
%_modulesloaddir /usr/lib/modules-load.d
%_modprobedir /usr/lib/modprobe.d

This makes installing files there more convenient because people don't need to
construct the path from %_prefix/lib/… .

See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/GBF5WJLTQVSXMHGYGBF3723ZYCWFBR7C/.
---

diff --git a/meson.build b/meson.build
index c18438a6b..866ee5abb 100644
--- a/meson.build
+++ b/meson.build
@@ -303,6 +303,7 @@ substs.set('rootlibexecdir',                                  rootlibexecdir)
 #endif // 0
 substs.set('udevrulesdir',                                    udevrulesdir)
 substs.set('udevlibexecdir',                                  udevlibexecdir)
+substs.set('environmentdir',                                  environmentdir)
 #if 0 /// UNNEEDED by elogind
 # substs.set('catalogdir',                                      catalogdir)
 # substs.set('tmpfilesdir',                                     tmpfilesdir)
@@ -310,6 +311,7 @@ substs.set('udevlibexecdir',                                  udevlibexecdir)
 # substs.set('sysctldir',                                       sysctldir)
 # substs.set('binfmtdir',                                       binfmtdir)
 # substs.set('modulesloaddir',                                  modulesloaddir)
+# substs.set('modprobedir',                                     modprobedir)
 # substs.set('systemgeneratordir',                              systemgeneratordir)
 # substs.set('usergeneratordir',                                usergeneratordir)
 # substs.set('systemenvgeneratordir',                           systemenvgeneratordir)
@@ -1913,6 +1915,7 @@ executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
+executable('elogind-user-runtime-dir',
 executable('elogind-user-runtime-dir',
            user_runtime_dir_sources,
            include_directories : includes,
@@ -3053,8 +3056,9 @@ if git.found()
                 'tags',
                 output : 'tags',
                 command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files)
-        run_target(
+        custom_target(
                 'ctags',
+                output : 'ctags',
                 command : [env, 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files)
 endif