[#3731] Fix installation of meson-info

diff --git a/install-meson-info.sh.in b/install-meson-info.sh.in
new file mode 100755 (executable)
index 0000000..02b9963
--- /dev/null
+++ b/install-meson-info.sh.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+# Destdir is set everytime the installation happens through meson or ninja even when --destdir is not passed.
+# Set target path to prefix in case someone wants to run this script directly.
+target_path='@PREFIX@'
+if test -n "${MESON_INSTALL_DESTDIR_PREFIX+x}"; then
+    target_path="${MESON_INSTALL_DESTDIR_PREFIX}"
+fi
+
+cp -r '@TOP_BUILD_DIR@/meson-info' "${target_path}/@DATADIR@/kea/meson-info"

diff --git a/meson.build b/meson.build
index c8e67714161b061002cb2dbaf377b7096f44f5a4..af337df7457a8b5c88ae81fe568961612c0710b6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -905,11 +905,16 @@ install_emptydir(RUNSTATEDIR)
 message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
 
 # Copy the meson.info directory during installation.
-if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
-    meson.add_install_script(
-        'cp',
-        '-r',
-        TOP_BUILD_DIR / 'meson-info',
-        PREFIX / DATADIR / 'kea/meson-info',
-    )
-endif
+install_meson_info = configure_file(
+    input: 'install-meson-info.sh.in',
+    output: 'install-meson-info.sh',
+    configuration: configuration_data(
+        {
+            'INSTALL': INSTALL.full_path(),
+            'PREFIX': PREFIX,
+            'TOP_BUILD_DIR': TOP_BUILD_DIR,
+            'DATADIR': DATADIR,
+        },
+    ),
+)
+meson.add_install_script(install_meson_info)

diff --git a/subprojects/krb5/meson.build b/subprojects/krb5/meson.build
index 6368cf1ef79105017006a6ceee805af45bcba955..9834d73e49ffd723622c9136cc45a93cb6c587eb 100644 (file)
--- a/subprojects/krb5/meson.build
+++ b/subprojects/krb5/meson.build
@@ -22,7 +22,7 @@ if krb5_config.found()
             compile_args: cflags.stdout().split(),
             link_args: libs.stdout().split(),
             version: krb5_version,
-            variables: { 'vendor': vendor, },
+            variables: {'vendor': vendor},
         )
     endif
 endif