Skip to content

Commit da58f7c

Browse files
author
Jonathon Kowalski
committed
Use libdir to install protocols
We pass something like: meson --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/bin \ --libdir=/usr/x86_64-pc-linux-gnu/lib --libexecdir=/usr/x86_64-pc-linux-gnu/libexec ... in exherbo, where /usr/lib is symlinked to /usr/$TARGET/lib, /usr/bin -> /usr/$TARGET/bin, and so on, but before this change they would be installed to /usr/lib, which does not work since that is a symlink as described above, so use the passed libdir to install protocols.
1 parent 9d7c14c commit da58f7c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

meson.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ endif
9595

9696
prefixdir = get_option('prefix')
9797
bindir = join_paths(prefixdir, get_option('bindir'))
98+
libdir = join_paths(prefixdir, get_option('libdir'))
9899
datadir = join_paths(prefixdir, get_option('datadir'))
99100
docdir = join_paths(datadir, 'doc/casync')
100-
protocoldir = join_paths(prefixdir, 'lib/casync/protocols')
101+
protocoldir = join_paths(libdir, 'casync/protocols')
101102
conf.set_quoted('CASYNC_PROTOCOL_PATH', protocoldir)
102103

103104
liblzma = dependency('liblzma',

0 commit comments

Comments
 (0)