2013-05-29 16:19:22

by John Kacur

Subject: [PATCH trace-cmd 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(-)

diff --git a/Makefile b/Makefile
index 83329ca..d53cde3 100644
--- a/Makefile
+++ b/Makefile
@@ -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))'
--
1.7.11.7

2013-05-29 16:19:16

by John Kacur

Subject: [PATCH trace-cmd 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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5966153
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore
--
1.7.11.7

2013-05-29 18:48:13

by Steven Rostedt

Subject: Re: [PATCH trace-cmd 2/2] git-housekeeping: Add the .gitattributes file

On Wed, 2013-05-29 at 18:18 +0200, John Kacur wrote:
> 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

> ---
> .gitattributes | 2 ++
> 1 file changed, 2 insertions(+)
> create mode 100644 .gitattributes
>
> diff --git a/.gitattributes b/.gitattributes
> new file mode 100644
> index 0000000..5966153
> --- /dev/null
> +++ b/.gitattributes
> @@ -0,0 +1,2 @@
> +.gitattributes export-ignore
> +.gitignore export-ignore