[PATCH] libtraceevent: fix header installation

From: Sudip Mukherjee
Date: Thu Nov 14 2019 - 08:37:44 EST


When we passed some location in DESTDIR, install_headers called
do_install with DESTDIR as part of the second argument. But do_install
is again using '$(DESTDIR_SQ)$2', so as a result the headers were
installed in a location $DESTDIR/$DESTDIR. In my testing I passed
DESTDIR=/home/sudip/test and the headers were installed in:
/home/sudip/test/home/sudip/test/usr/include/traceevent.
Lets remove DESTDIR from the second argument of do_install so that the
headers are installed in the correct location.

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
---

Hi Steve,
sent this earlier as an attachment to an email thread, not sure if you
saw it, so sending it now properly.
The other problem with the pkgconfig, I guess we can live with that for
now as that folder is given by pc_path.

tools/lib/traceevent/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 5315f3787f8d..cbb429f55062 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -232,10 +232,10 @@ install_pkgconfig:

install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
+ $(call do_install,event-parse.h,$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(includedir_SQ),644)

install: install_lib

--
2.11.0