From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 23 Feb 2021 10:49:49 +0000 (+0900)
Subject: Revert "meson: remove one more instance of install_dir:bindir"
X-Git-Tag: v248-rc2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774c0e433c482e1d1241bdcdb7d001d20c59f2d1;p=thirdparty%2Fsystemd.git

Revert "meson: remove one more instance of install_dir:bindir"

This reverts commit 5ffa2eaa541b718122a3422e911ef95f4c9981d7.

It seems that if install_dir is not specified, meson decides install path
based on file type, and non-executable binary files are installed under
/usr/share.

kernel-install is a script. So, we need to set install_dir argument
explicitly.

Fixes #18754.
---

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index 92ce23ecf91..4117188f147 100644
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -4,7 +4,8 @@ want_kernel_install = get_option('kernel-install')
 
 if want_kernel_install
         install_data('kernel-install',
-                     install_mode : 'rwxr-xr-x')
+                     install_mode : 'rwxr-xr-x',
+                     install_dir : bindir)
 
         install_data('00-entry-directory.install',
                      '50-depmod.install',