diff options
| author | Todd Zullinger <tmz@pobox.com> | 2013-01-04 22:42:16 -0500 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2013-02-26 09:47:36 -0500 |
| commit | 83fc4ea137f2c8137c758ac306c8ba0b3ad5fdbb (patch) | |
| tree | d809c054d59ff5120701f5f0066a7735c2ac156f | |
| parent | c3202fdeaf93fe4cc90445827ffecd1101c7076c (diff) | |
| download | git-package-tmz/docs.tar.gz git-package-tmz/docs.tar.xz git-package-tmz/docs.zip | |
Respect gitexecdir variable in git-subtree installtmz/docs
| -rw-r--r-- | 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch | 42 | ||||
| -rw-r--r-- | git.spec | 3 |
2 files changed, 45 insertions, 0 deletions
diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch new file mode 100644 index 0000000..73ae548 --- /dev/null +++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch @@ -0,0 +1,42 @@ +From 86c3e2b5188579bff1ff981910462ad5e563044b Mon Sep 17 00:00:00 2001 +From: Todd Zullinger <tmz@pobox.com> +Date: Fri, 4 Jan 2013 11:54:21 -0500 +Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir + +When the git subtree Makefile includes config.mak from the toplevel, +it's useful to have the same variables set globally applied. Using +gitexecdir instead of libexecdir respects the global settings more +consistently. + +Remove the unused gitdir variable as well. +--- + contrib/subtree/Makefile | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile +index 36ae3e4..f87b945 100644 +--- a/contrib/subtree/Makefile ++++ b/contrib/subtree/Makefile +@@ -2,9 +2,8 @@ + -include ../../config.mak + + prefix ?= /usr/local ++gitexecdir ?= $(prefix)/libexec/git-core + mandir ?= $(prefix)/share/man +-libexecdir ?= $(prefix)/libexec/git-core +-gitdir ?= $(shell git --exec-path) + man1dir ?= $(mandir)/man1 + + gitver ?= $(word 3,$(shell git --version)) +@@ -30,7 +29,7 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) + doc: $(GIT_SUBTREE_DOC) + + install: $(GIT_SUBTREE) +- $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) ++ $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) + + install-doc: install-man + +-- +1.7.6 + @@ -55,6 +55,7 @@ Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch Patch4: 0001-DESTDIR-support-in-contrib-subtree-Makefile.patch +Patch5: 0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -260,6 +261,7 @@ Requires: emacs-git = %{version}-%{release} %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 %if %{use_prebuilt_docs} mkdir -p prebuilt_docs/{html,man} @@ -549,6 +551,7 @@ rm -rf %{buildroot} - Install tcsh completion (requires manual setup by users) - Clean up dist conditionals, don't pretend to support EL-4 builds - Use prebuilt documentation on EL-5, where asciidoc is too old +- Respect gitexecdir variable in git-subtree install * Wed Feb 20 2013 Adam Tkac <atkac redhat com> - 1.8.1.4-1 - update to 1.8.1.4 |