3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch

66 lines
2.4 KiB
Diff
Raw Normal View History

2019-04-27 12:34:05 +01:00
diff --git a/Documentation/Makefile b/Documentation/Makefile
2019-07-25 21:13:17 +01:00
index 21e42fd..826361d 100644
2019-04-27 12:34:05 +01:00
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
2019-07-25 21:13:17 +01:00
@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force
2019-04-27 12:34:05 +01:00
GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
-install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
+install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
+
2019-07-25 21:13:17 +01:00
+install_gui: $(GUI_INSTALL)
+
+install: install_man install_gui
2019-04-27 12:34:05 +01:00
clean:
(cd $(obj); \
diff --git a/Makefile b/Makefile
2019-07-27 19:02:58 +01:00
index 3afd982..8dd55ba 100644
2019-04-27 12:34:05 +01:00
--- a/Makefile
+++ b/Makefile
2019-07-27 19:02:58 +01:00
@@ -293,7 +293,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
2019-04-27 12:34:05 +01:00
libtracecmd.a: $(LIBTRACECMD_STATIC)
libtracecmd.so: $(LIBTRACECMD_SHARED)
-libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED)
+libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC)
plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
$(Q)$(MAKE) -C $(src)/plugins
2019-07-27 19:02:58 +01:00
@@ -349,6 +349,8 @@ install_gui: install_cmd gui
2019-04-27 12:34:05 +01:00
install_libs: libs
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ))
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ))
$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
2019-04-27 12:34:05 +01:00
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
2019-07-27 19:02:58 +01:00
@@ -360,6 +362,12 @@ doc:
2019-04-27 12:34:05 +01:00
doc_clean:
$(MAKE) -C $(src)/Documentation clean
+install_man:
+ $(MAKE) -C $(src)/Documentation install_man
2019-07-25 21:13:17 +01:00
+
+install_gui_docs:
+ $(MAKE) -C $(src)/Documentation install_gui
2019-04-27 12:34:05 +01:00
+
install_doc:
$(MAKE) -C $(src)/Documentation install
2019-07-27 19:02:58 +01:00
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index 21494cc..d91c365 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 /usr/share/polkit-1/actions/)
+ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/)
install(PROGRAMS "${KS_DIR}/bin/kshark-su-record"
DESTINATION ${_INSTALL_PREFIX}/bin/)