Blame 0001-trace-cmd-Figure-out-the-arch-and-install-library-to.patch
|
|
cb074fe |
From 7e8a6e3d03c0a6a7a5014ce488be1e16f99db006 Mon Sep 17 00:00:00 2001
|
|
|
cb074fe |
From: Zamir SUN <sztsian@gmail.com>
|
|
|
cb074fe |
Date: Sat, 11 Nov 2017 10:28:32 +0800
|
|
|
cb074fe |
Subject: [PATCH] trace-cmd: Figure out the arch and install library to the
|
|
|
cb074fe |
right place
|
|
|
cb074fe |
|
|
|
cb074fe |
Signed-off-by: Zamir SUN <sztsian@gmail.com>
|
|
|
cb074fe |
---
|
|
|
cb074fe |
Makefile | 8 +++++++-
|
|
|
cb074fe |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
cb074fe |
|
|
|
cb074fe |
diff --git a/Makefile b/Makefile
|
|
|
cb074fe |
index 5c35143..d10e547 100644
|
|
|
cb074fe |
--- a/Makefile
|
|
|
cb074fe |
+++ b/Makefile
|
|
|
cb074fe |
@@ -47,7 +47,13 @@ html_install = $(prefix)/share/kernelshark/html
|
|
|
cb074fe |
html_install_SQ = '$(subst ','\'',$(html_install))'
|
|
|
cb074fe |
img_install = $(prefix)/share/kernelshark/html/images
|
|
|
cb074fe |
img_install_SQ = '$(subst ','\'',$(img_install))'
|
|
|
cb074fe |
-libdir ?= $(prefix)/lib
|
|
|
cb074fe |
+
|
|
|
cb074fe |
+# figure out what arch we are on and install to the right place
|
|
|
cb074fe |
+ARCH = $(shell getconf LONG_BIT)
|
|
|
cb074fe |
+LIBDIR_32 = /lib
|
|
|
cb074fe |
+LIBDIR_64 = /lib64
|
|
|
cb074fe |
+
|
|
|
cb074fe |
+libdir ?= $(prefix)/$(LIBDIR_$(ARCH))
|
|
|
cb074fe |
libdir_SQ = '$(subst ','\'',$(libdir))'
|
|
|
cb074fe |
includedir = $(prefix)/include/trace-cmd
|
|
|
cb074fe |
includedir_SQ = '$(subst ','\'',$(includedir))'
|
|
|
cb074fe |
--
|
|
|
cb074fe |
2.13.4
|
|
|
cb074fe |
|