Use libdir to install protocols #138
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It would also be nice to have a release soon, preferably after this gets merged. =) |
|
Something like this was attempted and rejected in #106 |
|
ping |
poettering
reviewed
Jan 24, 2019
meson.build
Outdated
| datadir = join_paths(prefixdir, get_option('datadir')) | ||
| docdir = join_paths(datadir, 'doc/casync') | ||
| protocoldir = join_paths(prefixdir, 'lib/casync/protocols') | ||
| protocoldir = join_paths(libdir, 'casync/protocols') |
There was a problem hiding this comment.
libdir is the wrong place for executable binaries. If anything it should be libexecdir, but not libdir here.
|
OK, OK, let's make this work. But please change the patch so that the default remains as it is now, and make |
Adjust protocoldir accordingly when it is passed.
|
Sorry, I kept missing this all this time. Is this close to what you wanted (I'm not really great at meson)? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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. Other *dirs were working correctly.