mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#3732] Install emptydirs in hardcoded path when the prefix is not explicitly provided

Browse Source
This commit is contained in:
Andrei Pavel 2025-04-02 18:59:40 +03:00
parent 7582908787
commit 5eb4ec8f9b
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.dummy Normal file
View File

25
meson.build
View File

@ -59,16 +59,18 @@ KEA_ADMIN_BUILT = TOP_BUILD_DIR / 'src/bin/admin/kea-admin'
KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin' KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc' KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc' KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
SHAREDSTATEDIR = LOCALSTATEDIR / 'lib/kea' LOGDIR = LOCALSTATEDIR / 'log'
SHAREDSTATEDIR_INSTALLED = PREFIX / SHAREDSTATEDIR LOGDIR_INSTALLED = PREFIX / LOGDIR
RUNSTATEDIR = LOCALSTATEDIR / 'run/kea' RUNSTATEDIR = LOCALSTATEDIR / 'run/kea'
RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR
SHAREDSTATEDIR = LOCALSTATEDIR / 'lib/kea'
SHAREDSTATEDIR_INSTALLED = PREFIX / SHAREDSTATEDIR
TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca' TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
# Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not. # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not.
# So we revert what it does. # So we revert what it does.
# Prepend prefix only if the prefix was explicitly provided. # Prepend prefix only if the prefix was explicitly provided.
if PREFIX == '/usr' if PREFIX == '/usr/local'
SYSCONFDIR_INSTALLED = SYSCONFDIR SYSCONFDIR_INSTALLED = SYSCONFDIR
else else
SYSCONFDIR_INSTALLED = PREFIX / SYSCONFDIR SYSCONFDIR_INSTALLED = PREFIX / SYSCONFDIR
@ -1031,8 +1033,23 @@ top_docs = [
'platforms.rst', 'platforms.rst',
] ]
install_data(top_docs, install_dir: DATADIR / 'doc/kea') install_data(top_docs, install_dir: DATADIR / 'doc/kea')
install_emptydir(SHAREDSTATEDIR)
install_emptydir(LOGDIR)
install_emptydir(RUNSTATEDIR) install_emptydir(RUNSTATEDIR)
install_emptydir(SHAREDSTATEDIR)
# Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not.
# So we revert what it does..
# In case prefix is default, install to hardcoded path.
if PREFIX == '/usr/local'
install_emptydir('/usr/local/lib/kea')
install_emptydir('/usr/local/log')
install_emptydir('/usr/local/run/kea')
install_emptydir('/usr/local/var/lib/kea')
install_emptydir('/usr/local/var/log')
install_emptydir('/usr/local/var/run/kea')
install_emptydir('/var/local/run/kea')
endif
# Print the setup report. # Print the setup report.
message(run_command(['cat', CONFIG_REPORT], check: true).stdout()) message(run_command(['cat', CONFIG_REPORT], check: true).stdout())