kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Makefile cleanup.

* jk/doc-build-move-infordir-def:
  Documentation/Makefile: move infodir to be with other '*dir's
  Documentation/Makefile: fix spaces around assignments
maint
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Documentation/Makefile
View File

@ -31,11 +31,11 @@ MAN7_TXT += gittutorial.txt
MAN7_TXT += gitworkflows.txt MAN7_TXT += gitworkflows.txt


MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))


OBSOLETE_HTML = git-remote-helpers.html OBSOLETE_HTML = git-remote-helpers.html
DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML) DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)


ARTICLES = howto-index ARTICLES = howto-index
ARTICLES += everyday ARTICLES += everyday
@ -74,35 +74,35 @@ SP_ARTICLES += technical/api-index


DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))


DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT))
DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT)) DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) 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
pdfdir?=$(prefix)/share/doc/git-doc infodir ?= $(prefix)/share/info
mandir?=$(prefix)/share/man pdfdir ?= $(prefix)/share/doc/git-doc
man1dir=$(mandir)/man1 mandir ?= $(prefix)/share/man
man5dir=$(mandir)/man5 man1dir = $(mandir)/man1
man7dir=$(mandir)/man7 man5dir = $(mandir)/man5
# DESTDIR= man7dir = $(mandir)/man7
# DESTDIR =


ASCIIDOC = asciidoc ASCIIDOC = asciidoc
ASCIIDOC_EXTRA = ASCIIDOC_EXTRA =
MANPAGE_XSL = manpage-normal.xsl MANPAGE_XSL = manpage-normal.xsl
XMLTO = xmlto XMLTO = xmlto
XMLTO_EXTRA = XMLTO_EXTRA =
INSTALL?=install INSTALL ?= install
RM ?= rm -f 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 DBLATEX = dblatex
DBLATEX=dblatex
ifndef PERL_PATH ifndef PERL_PATH
PERL_PATH = /usr/bin/perl PERL_PATH = /usr/bin/perl
endif endif