Use systemd_user_unit_dir from systemd.pc, if found #35
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
If `pkg-config` can find `systemd.pc` (e.g. `/usr/share/pkgconfig/systemd.pc`), use its `systemd_user_unit_dir` for the location of `psi-notify.service`. We override `prefix` to be whatever the user sets, which should work both for the distribution use case (`prefix` overridden to `/usr`) and for local compilation (`prefix` defaults to `/usr/local`) Fall back to the old definition in case `systemd.pc` is not found. Signed-off-by: Michel Alexandre Salim <[email protected]>
|
Tested using mock on my Fedora machine
Both builds succeed as before |
|
Sorry, this one somehow slipped off my radar :-)
|
cdown
reviewed
Sep 26, 2022
| ifeq ($(HAS_SYSTEMD),1) | ||
| SYSTEMD_USER_UNIT_DIR:=$(shell pkg-config --define-variable=prefix=$(prefix) --variable systemd_user_unit_dir systemd) | ||
| else | ||
| $(warning systemd not found, using default for SYSTEMD_USER_UNIT_DIR) |
There was a problem hiding this comment.
probably clearer if you say "pkg-config for systemd"
|
Been a bit, but just checking if you saw the compat question above :-) |
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.
If
pkg-configcan findsystemd.pc(e.g./usr/share/pkgconfig/systemd.pc), use itssystemd_user_unit_dirfor the location ofpsi-notify.service.We override
prefixto be whatever the user sets, which should work both for the distribution use case (prefixoverridden to/usr) and for local compilation (prefixdefaults to/usr/local)Fall back to the old definition in case
systemd.pcis not found.Signed-off-by: Michel Alexandre Salim [email protected]