]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
meson: bring hexdump in line with others
authorChristian Hesse <mail@eworm.de>
Wed, 12 Mar 2025 13:06:14 +0000 (14:06 +0100)
committerKarel Zak <kzak@redhat.com>
Thu, 13 Mar 2025 09:21:04 +0000 (10:21 +0100)
Before it was different, and the executable was not installed.

(cherry picked from commit ecd8d1e56ca5aeef0b47f3a2b855b83e121359b8)

meson.build

index 2c7477789b1eb522279e8b10bc90e00c1109145f..bab3f415cc06e8a51a84771bb25355e2d896cbc7 100644 (file)
@@ -1409,18 +1409,17 @@ if opt and not is_disabler(exe)
   bashcompletions += ['more']
 endif
 
-if not get_option('build-hexdump').disabled()
-  exe = executable(
-    'hexdump',
-    hexdump_sources,
-    include_directories : includes,
-    link_with : [lib_common,
-                 lib_tcolors],
-    install_dir : usrbin_exec_dir)
-else
-  exe = disabler()
-endif
-if not is_disabler(exe)
+opt = not get_option('build-hexdump').disabled()
+exe = executable(
+  'hexdump',
+  hexdump_sources,
+  include_directories : includes,
+  link_with : [lib_common,
+               lib_tcolors],
+  install_dir : usrbin_exec_dir,
+  install : opt,
+  build_by_default : opt)
+if opt and not is_disabler(exe)
     exes += exe
     manadocs += hexdump_manadocs
     bashcompletions += ['hexdump']