[v2] trace-cmd: Correct the install paths of traceevent and trace-cmd libraries
diff mbox series

Message ID 20190920120132.30824-1-y.karadz@gmail.com
State Accepted
Commit 29b558b37057b80daa6e20413412c9a1697500e2
Headers show
Series
  • [v2] trace-cmd: Correct the install paths of traceevent and trace-cmd libraries
Related show

Commit Message

Yordan Karadzhov (VMware) Sept. 20, 2019, 12:01 p.m. UTC
In order to be able to use the installed versions of the library's headers
(and the libraries itself) the directories structure of the source has to
be reprodused in the install location.

This modification is needed by the NumPy interface of KernelShark.

Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index dabdf8d..6c66c02 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@  img_install = $(prefix)/share/kernelshark/html/images
 img_install_SQ = '$(subst ','\'',$(img_install))'
 libdir ?= $(prefix)/lib
 libdir_SQ = '$(subst ','\'',$(libdir))'
-includedir = $(prefix)/include/trace-cmd
+includedir = $(prefix)/include
 includedir_SQ = '$(subst ','\'',$(includedir))'
 
 export man_dir man_dir_SQ html_install html_install_SQ INSTALL
@@ -344,12 +344,12 @@  install_gui: install_cmd gui
 	$(Q)$(MAKE) $(S) -C $(kshark-dir)/build install
 
 install_libs: libs
-	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
-	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
+	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
+	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
 	$(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))
-	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ))
+	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd)
+	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ)/trace-cmd)
 
 doc:
 	$(MAKE) -C $(src)/Documentation all