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:
parent
9938ab10c1
commit
9c5aa9afcf
12
install-meson-info.sh.in
Executable file
12
install-meson-info.sh.in
Executable 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"
|
21
meson.build
21
meson.build
@ -905,11 +905,16 @@ install_emptydir(RUNSTATEDIR)
|
|||||||
message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
|
message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
|
||||||
|
|
||||||
# Copy the meson.info directory during installation.
|
# Copy the meson.info directory during installation.
|
||||||
if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
|
install_meson_info = configure_file(
|
||||||
meson.add_install_script(
|
input: 'install-meson-info.sh.in',
|
||||||
'cp',
|
output: 'install-meson-info.sh',
|
||||||
'-r',
|
configuration: configuration_data(
|
||||||
TOP_BUILD_DIR / 'meson-info',
|
{
|
||||||
PREFIX / DATADIR / 'kea/meson-info',
|
'INSTALL': INSTALL.full_path(),
|
||||||
)
|
'PREFIX': PREFIX,
|
||||||
endif
|
'TOP_BUILD_DIR': TOP_BUILD_DIR,
|
||||||
|
'DATADIR': DATADIR,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
meson.add_install_script(install_meson_info)
|
||||||
|
@ -22,7 +22,7 @@ if krb5_config.found()
|
|||||||
compile_args: cflags.stdout().split(),
|
compile_args: cflags.stdout().split(),
|
||||||
link_args: libs.stdout().split(),
|
link_args: libs.stdout().split(),
|
||||||
version: krb5_version,
|
version: krb5_version,
|
||||||
variables: { 'vendor': vendor, },
|
variables: {'vendor': vendor},
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user