Makefile: add libdir variable
PATCH 1/2 Makefile: add libdir variable
This will allow build scripts such as rpm to set libdir=lib64
Signed-off-by John Kacur <[email protected]>
--- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Makefile +3 -2
@@ -47,6 +47,7 @@ html_install = $(prefix)/share/kernelshark/html html_install_SQ = '$(subst ','\'',$(html_install))' img_install = $(prefix)/share/kernelshark/html/images img_install_SQ = '$(subst ','\'',$(img_install))' +libdir ?= lib export man_dir man_dir_SQ html_install html_install_SQ INSTALL export img_install img_install_SQ
@@ -56,8 +57,8 @@ ifeq ($(prefix),$(HOME)) plugin_dir = $(HOME)/.trace-cmd/plugins python_dir = $(HOME)/.trace-cmd/python else -plugin_dir = $(prefix)/lib/trace-cmd/plugins -python_dir = $(prefix)/lib/trace-cmd/python +plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins +python_dir = $(prefix)/$(libdir)/trace-cmd/python PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)" PYTHON_DIR = -DPYTHON_DIR="$(python_dir)" PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
Signature · 1 line
1.7.11.7
PATCH 2/2 git-housekeeping: Add the .gitattributes file
By adding the .gitattributes file, git-archive can be informed not to includes files such as .gitignore and ironically .gitattributes
Signed-off-by John Kacur <[email protected]>
--- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes
.gitattributes new file +2 -0
@@ -0,0 +1,2 @@ +.gitattributes export-ignore +.gitignore export-ignore
Signature · 1 line
1.7.11.7
Re: [PATCH trace-cmd 2/2] git-housekeeping: Add the .gitattributes file
Quoted 4 lines · John Kacur
By adding the .gitattributes file, git-archive can be informed not to includes files such as .gitignore and ironically .gitattributes
Signed-off-by John Kacur <[email protected]>
Thanks John, I'll pick these up.
-- Steve
Quoted 13 lines
--- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes.gitattributes new file +2
-0@@ -0,0 +1,2 @@ +.gitattributes export-ignore +.gitignore export-ignore