Skip to content

Commit 478785f

Browse files
committed
[#3731] More builtin options
1 parent 9a891f8 commit 478785f

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

meson.build

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ TOP_SOURCE_DIR = meson.current_source_dir()
3939

4040
BINDIR = get_option('bindir')
4141
DATADIR = get_option('datadir')
42+
INCLUDEDIR = get_option('includedir')
4243
LIBDIR = get_option('libdir')
4344
LOCALSTATEDIR = get_option('localstatedir')
4445
MANDIR = get_option('mandir')
@@ -840,7 +841,7 @@ configure_file(
840841
output: 'config.h',
841842
configuration: conf_data,
842843
install: true,
843-
install_dir: 'include/kea',
844+
install_dir: INCLUDEDIR / 'kea',
844845
)
845846

846847
# TODO: Change to kea_version.h.in when autotools are removed.
@@ -849,7 +850,7 @@ configure_file(
849850
output: 'kea_version.h',
850851
configuration: conf_data,
851852
install: true,
852-
install_dir: 'include/kea',
853+
install_dir: INCLUDEDIR / 'kea',
853854
)
854855

855856
#### Build Starts Here
@@ -897,7 +898,8 @@ top_docs = [
897898
'platforms.rst',
898899
]
899900
install_data(top_docs, install_dir: DATADIR / 'doc/kea')
900-
install_emptydir('var/run/kea')
901+
# No builtin option for 'var/run'.
902+
install_emptydir(LOCALSTATEDIR / 'run/kea')
901903

902904
# Print the setup report.
903905
message(run_command(['cat', CONFIG_REPORT], check: true).stdout())

src/bin/keactrl/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
keactrl_conf_data = configuration_data()
22
keactrl_conf_data.set('prefix', PREFIX)
3-
keactrl_conf_data.set('sysconfdir', '${prefix}/@SYSCONFDIR@')
3+
keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
44
keactrl_conf_data.set('PACKAGE', 'kea')
55
keactrl_conf_data.set('exec_prefix', '${prefix}')
66
keactrl_conf_data.set('sbindir', '${prefix}/' + SBINDIR)

src/share/yang/modules/utils/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ configure_file(
3030
output: 'reinstall.sh',
3131
configuration: yang_utils_conf_data,
3232
install: true,
33-
install_dir: 'share/kea/yang/modules/utils',
33+
install_dir: DATADIR / 'kea/yang/modules/utils',
3434
)

0 commit comments

Comments
 (0)