Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's

2013-06-17 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes:

 Signed-off-by: John Keeping j...@keeping.me.uk
 ---

Thanks; will directly apply 1/2 on maint.  I am not absolutely sure
about this one, where variables related to an optional info
support used to be in one place but with the patch only infodir is
separated away.  Maybe it is not a big deal, though.

  Documentation/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Documentation/Makefile b/Documentation/Makefile
 index af3d8a4..0cfdc36 100644
 --- a/Documentation/Makefile
 +++ b/Documentation/Makefile
 @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
  prefix ?= $(HOME)
  bindir ?= $(prefix)/bin
  htmldir ?= $(prefix)/share/doc/git-doc
 +infodir ?= $(prefix)/share/info
  pdfdir ?= $(prefix)/share/doc/git-doc
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
 @@ -98,7 +99,6 @@ RM ?= rm -f
  MAN_REPO = ../../git-manpages
  HTML_REPO = ../../git-htmldocs
  
 -infodir ?= $(prefix)/share/info
  MAKEINFO = makeinfo
  INSTALL_INFO = install-info
  DOCBOOK2X_TEXI = docbook2x-texi
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's

2013-06-17 Thread Jonathan Nieder
Jun 17, 2013 at 01:14:51PM -0700, Junio C Hamano wrote:
 John Keeping j...@keeping.me.uk writes:

 Signed-off-by: John Keeping j...@keeping.me.uk
 ---

 Thanks; will directly apply 1/2 on maint.  I am not absolutely sure
 about this one, where variables related to an optional info
 support used to be in one place but with the patch only infodir is
 separated away.  Maybe it is not a big deal, though.

In practice, I think keeping the variables that specify the filesystem
hierarchy together is more useful (or in other words, this looks like a
good patch).

Thanks,
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's

2013-06-16 Thread John Keeping
Signed-off-by: John Keeping j...@keeping.me.uk
---
 Documentation/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index af3d8a4..0cfdc36 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
 prefix ?= $(HOME)
 bindir ?= $(prefix)/bin
 htmldir ?= $(prefix)/share/doc/git-doc
+infodir ?= $(prefix)/share/info
 pdfdir ?= $(prefix)/share/doc/git-doc
 mandir ?= $(prefix)/share/man
 man1dir = $(mandir)/man1
@@ -98,7 +99,6 @@ RM ?= rm -f
 MAN_REPO = ../../git-manpages
 HTML_REPO = ../../git-htmldocs
 
-infodir ?= $(prefix)/share/info
 MAKEINFO = makeinfo
 INSTALL_INFO = install-info
 DOCBOOK2X_TEXI = docbook2x-texi
-- 
1.8.3.779.g691e267

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html