]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
meson: keep bash-completion symlinks in variable
authorKarel Zak <kzak@redhat.com>
Tue, 4 Jan 2022 11:17:41 +0000 (12:17 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 4 Jan 2022 11:17:41 +0000 (12:17 +0100)
This is small consolidation, let's call meson_make_symlink from one
place in loop.

Addresses: https://github.com/util-linux/util-linux/pull/1549
Signed-off-by: Karel Zak <kzak@redhat.com>
meson.build

index dced67076d65132bce63c679940fe6e1edf52164..be02e71fd01f1b11b0be21fe11449b5949c91ad7 100644 (file)
@@ -753,7 +753,9 @@ add_project_arguments('-include', 'config.h', language : 'c')
 
 manadocs = []
 manlinks = {}
+
 bashcompletions = []
+bashcompletionslinks = {}
 
 subdir('include')
 subdir('lib')
@@ -847,6 +849,7 @@ if opt and not is_disabler(exe)
   manadocs += ['login-utils/last.1.adoc']
   manlinks += {'lastb.1': 'last.1'}
   bashcompletions += ['last']
+  bashcompletionslinks += {'lastb': 'last'}
 endif
 
 opt = not get_option('build-nologin').disabled()
@@ -977,11 +980,7 @@ exe = executable(
 if opt and not is_disabler(exe)
   exes += exe
   manadocs += ['login-utils/runuser.1.adoc']
-  if bash_completion.found()
-    meson.add_install_script(meson_make_symlink,
-                             'su',
-                             join_paths(bash_completion.get_variable('completionsdir'), 'runuser'))
-endif
+  bashcompletionslinks += {'runuser': 'su'}
 endif
 
 ############################################################
@@ -3234,4 +3233,9 @@ if bash_completion.found()
       install_dir : bash_completion.get_variable('completionsdir')
     )
   endforeach
+  foreach link_name, target : bashcompletionslinks
+    meson.add_install_script(meson_make_symlink,
+      target,
+      join_paths(bash_completion.get_variable('completionsdir'), link_name))
+  endforeach
 endif