2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 01:49:48 +00:00

[#3731] Fix installation of meson-info

This commit is contained in:
Andrei Pavel 2025-03-19 12:36:56 +02:00
parent 9938ab10c1
commit 9c5aa9afcf
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
3 changed files with 26 additions and 9 deletions

12
install-meson-info.sh.in Executable file
View File

@ -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"

View File

@ -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)

View File

@ -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