Skip to content

Commit 3cf1fc5

Browse files
committed
Let -Dlibexecdir take preference
Adjust protocoldir accordingly when it is passed.
1 parent 9d7c14c commit 3cf1fc5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

meson.build

+7-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,13 @@ prefixdir = get_option('prefix')
9797
bindir = join_paths(prefixdir, get_option('bindir'))
9898
datadir = join_paths(prefixdir, get_option('datadir'))
9999
docdir = join_paths(datadir, 'doc/casync')
100-
protocoldir = join_paths(prefixdir, 'lib/casync/protocols')
100+
101+
if get_option('libexecdir')
102+
libexecdir = join_paths(prefixdir, get_option('libexecdir'))
103+
protocoldir = join_paths(libexecdir, 'casync/protocols')
104+
else
105+
protocoldir = join_paths(prefixdir, 'casync/protocols')
106+
101107
conf.set_quoted('CASYNC_PROTOCOL_PATH', protocoldir)
102108

103109
liblzma = dependency('liblzma',

0 commit comments

Comments
 (0)