| Message ID | 20190725194739.140392211@goodmis.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a556a27053d43836f73dfb7ed884cf21a26d40d9 |
| Headers | show |
| Series | kernel-shark: Let polkit decide the environment and path of kshark-record | expand |
On 25.07.19 г. 22:45 ч., Steven Rostedt wrote: > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > This reverts the change in a45ab5a44 ("kernel-shark: Remove hard-coded > install paths") that removed the full path of installing > org.freedesktop.kshark-record.policy to a relative path. This means if we > installed in /usr/local/bin the policy still needs to go into > /usr/share/polkit-1/actions/ > > This does not affect DESTDIR, as installing still goes in the relative path > from DESTDIR for package maintainers. > > Suggested-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Thanks! Reviewed-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> > --- > kernel-shark/src/CMakeLists.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt > index d91c3650f0dd..21494cccaf55 100644 > --- a/kernel-shark/src/CMakeLists.txt > +++ b/kernel-shark/src/CMakeLists.txt > @@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) > DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) > > install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" > - DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/) > + DESTINATION /usr/share/polkit-1/actions/) > > install(PROGRAMS "${KS_DIR}/bin/kshark-su-record" > DESTINATION ${_INSTALL_PREFIX}/bin/) >
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt index d91c3650f0dd..21494cccaf55 100644 --- a/kernel-shark/src/CMakeLists.txt +++ b/kernel-shark/src/CMakeLists.txt @@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" - DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/) + DESTINATION /usr/share/polkit-1/actions/) install(PROGRAMS "${KS_DIR}/bin/kshark-su-record" DESTINATION ${_INSTALL_PREFIX}/bin/)