From 3cf1fc55691dc29f05b8c5ad1d7a47a2b4b36f7e Mon Sep 17 00:00:00 2001 From: Jonathan Kowalski Date: Tue, 6 Mar 2018 12:40:57 +0000 Subject: [PATCH] Let -Dlibexecdir take preference Adjust protocoldir accordingly when it is passed. --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f42ed162..05cdfc72 100644 --- a/meson.build +++ b/meson.build @@ -97,7 +97,13 @@ prefixdir = get_option('prefix') bindir = join_paths(prefixdir, get_option('bindir')) datadir = join_paths(prefixdir, get_option('datadir')) docdir = join_paths(datadir, 'doc/casync') -protocoldir = join_paths(prefixdir, 'lib/casync/protocols') + +if get_option('libexecdir') + libexecdir = join_paths(prefixdir, get_option('libexecdir')) + protocoldir = join_paths(libexecdir, 'casync/protocols') +else + protocoldir = join_paths(prefixdir, 'casync/protocols') + conf.set_quoted('CASYNC_PROTOCOL_PATH', protocoldir) liblzma = dependency('liblzma',