Skip to content

Commit 1cdaf3f

Browse files
committed
meson
1 parent 4ff6271 commit 1cdaf3f

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

dpid/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ configure_file(
4141
capture: true,
4242
install_dir: get_option('sysconfdir'),
4343
install: true,
44+
install_tag: 'runtime',
4445
)

meson.build

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ conf.set_quoted(
5656
get_option('prefix') / get_option('sysconfdir') / meson.project_name()
5757
+ '/',
5858
)
59-
conf.set_quoted('DPIDRC_SYS', get_option('sysconfdir') / 'dpidrc')
59+
conf.set_quoted('DPIDRC_SYS', get_option('sysconfdir') / meson.project_name() / 'dpidrc')
6060
conf.set_quoted('EXEEXT', exe_suffix)
6161
conf.set_quoted('PACKAGE', meson.project_name())
6262

@@ -191,7 +191,12 @@ if use_tls.enabled()
191191
message('Using fallback mbedtls2 definition')
192192
mbedtls = declare_dependency(
193193
include_directories: ['/usr/include/mbedtls2/'],
194-
link_args: ['-L/usr/lib/mbedtls2', '-lmbedtls', '-lmbedx509', '-lmbedcrypto']
194+
link_args: [
195+
'-L/usr/lib/mbedtls2',
196+
'-lmbedtls',
197+
'-lmbedx509',
198+
'-lmbedcrypto',
199+
],
195200
)
196201
all_deps += mbedtls
197202
endif
@@ -287,6 +292,12 @@ configure_file(
287292
configuration: conf,
288293
)
289294

295+
install_data(
296+
files('dillorc'),
297+
install_dir: get_option('sysconfdir') / meson.project_name(),
298+
install_tag: 'runtime',
299+
)
300+
290301
############
291302
# Subdirs! #
292303
############

src/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,8 @@ sysconf_files = files(
6868
'keysrc',
6969
)
7070

71-
install_data(sysconf_files, install_dir: get_option('sysconfdir'))
71+
install_data(
72+
sysconf_files,
73+
install_dir: get_option('sysconfdir') / meson.project_name(),
74+
install_tag: 'runtime',
75+
)

0 commit comments

Comments
 (0)