nixpkgs-suyu/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
2019-07-25 21:36:09 +02:00

47 lines
1.7 KiB
Diff

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 21e42fd..b74c912 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -108,7 +108,9 @@ $(IMGS_INSTALL): %.png.install : %.png force
GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
-install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
+install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
+
+install: install_man $(GUI_INSTALL)
clean:
(cd $(obj); \
diff --git a/Makefile b/Makefile
index 3e63e9e..65743c6 100644
--- a/Makefile
+++ b/Makefile
@@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
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
@@ -348,6 +348,8 @@ install_gui: install_cmd gui
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)
$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
@@ -359,6 +361,9 @@ doc:
doc_clean:
$(MAKE) -C $(src)/Documentation clean
+install_man:
+ $(MAKE) -C $(src)/Documentation install_man
+
install_doc:
$(MAKE) -C $(src)/Documentation install