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

Message ID 20190920104831.23475-3-y.karadz@gmail.com
State Superseded
Headers show
Series
  • Fixes needed for KS 1.1
Related show

Commit Message

Yordan Karadzhov (VMware) Sept. 20, 2019, 10:48 a.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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Yordan Karadzhov (VMware) Sept. 20, 2019, noon UTC | #1
This one is wrong. Please ignore it.
I am sending v2.

Thanks!
Yordan

On 20.09.19 г. 13:48 ч., Yordan Karadzhov (VMware) wrote:
> 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 | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index dabdf8d..7124b2f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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
>

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index dabdf8d..7124b2f 100644
--- a/Makefile
+++ b/Makefile
@@ -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