mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/doc-build-move-infordir-def'

Browse Source 
Makefile cleanup.

* jk/doc-build-move-infordir-def:
  Documentation/Makefile: move infodir to be with other '*dir's
  Documentation/Makefile: fix spaces around assignments
This commit is contained in:
Junio C Hamano
2013-06-24 13:48:51 -07:00
parent 515cded0fb e21db2c6ad
commit c47d4380c7
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Makefile
View File

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