# [PATCH 1/2] Documentation/Makefile: fix spaces around assignments 4 messages from 2013-06-16 to 2013-06-18. Participants: John Keeping, Junio C Hamano, Jonathan Nieder. Thread: https://gitlist.dev/t/34165 ## John Keeping, 2013-06-16 17:13 Subject: [PATCH 1/2] Documentation/Makefile: fix spaces around assignments Message-ID: <4857ab4f4097c582063f064f657a8e5dfbfee232.1371402684.git.john@keeping.me.uk> URL: https://gitlist.dev/e/4857ab4f4097c582063f064f657a8e5dfbfee232.1371402684.git.john%40keeping.me.uk ``` A simple style fix; no functional change. Signed-off-by: John Keeping --- Nothing in maint..pu is touching this at the moment, so hopefully this is a good time to fix the whitespace here. Documentation/Makefile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 62dbd9a..af3d8a4 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -31,11 +31,11 @@ MAN7_TXT += gittutorial.txt MAN7_TXT += gitworkflows.txt MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) -MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) -MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) +MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT)) +MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) OBSOLETE_HTML = git-remote-helpers.html -DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML) +DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML) ARTICLES = howto-index ARTICLES += everyday @@ -74,35 +74,35 @@ SP_ARTICLES += technical/api-index DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) -DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) -DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT)) -DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) +DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT)) +DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT)) +DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT)) -prefix?=$(HOME) -bindir?=$(prefix)/bin -htmldir?=$(prefix)/share/doc/git-doc -pdfdir?=$(prefix)/share/doc/git-doc -mandir?=$(prefix)/share/man -man1dir=$(mandir)/man1 -man5dir=$(mandir)/man5 -man7dir=$(mandir)/man7 -# DESTDIR= +prefix ?= $(HOME) +bindir ?= $(prefix)/bin +htmldir ?= $(prefix)/share/doc/git-doc +pdfdir ?= $(prefix)/share/doc/git-doc +mandir ?= $(prefix)/share/man +man1dir = $(mandir)/man1 +man5dir = $(mandir)/man5 +man7dir = $(mandir)/man7 +# DESTDIR = ASCIIDOC = asciidoc ASCIIDOC_EXTRA = MANPAGE_XSL = manpage-normal.xsl XMLTO = xmlto XMLTO_EXTRA = -INSTALL?=install +INSTALL ?= install 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 -DBLATEX=dblatex +infodir ?= $(prefix)/share/info +MAKEINFO = makeinfo +INSTALL_INFO = install-info +DOCBOOK2X_TEXI = docbook2x-texi +DBLATEX = dblatex ifndef PERL_PATH PERL_PATH = /usr/bin/perl endif -- 1.8.3.779.g691e267 ``` ## John Keeping, 2013-06-16 17:13 Subject: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's Message-ID: URL: https://gitlist.dev/e/ffea107da7b3b7d5e390d27397d3a72155e942b4.1371402684.git.john%40keeping.me.uk In-Reply-To: <4857ab4f4097c582063f064f657a8e5dfbfee232.1371402684.git.john@keeping.me.uk> ``` Signed-off-by: John Keeping --- 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 ``` ## Junio C Hamano, 2013-06-17 20:14 Subject: Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's Message-ID: <7vppvkbikk.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vppvkbikk.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` John Keeping writes: > Signed-off-by: John Keeping > --- 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 ``` ## Jonathan Nieder, 2013-06-18 04:32 Subject: Re: [PATCH 2/2] Documentation/Makefile: move infodir to be with other '*dir's Message-ID: <20130618043240.GA2896@elie.Belkin> URL: https://gitlist.dev/e/20130618043240.GA2896%40elie.Belkin In-Reply-To: <7vppvkbikk.fsf@alter.siamese.dyndns.org> ``` Jun 17, 2013 at 01:14:51PM -0700, Junio C Hamano wrote: > John Keeping writes: >> Signed-off-by: John Keeping >> --- > > 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 ```