at master 1.3 kB view raw
1This patch does two things: (1) use the right name for `docbook2texi', 2and (2) make sure `gitman.info' isn't produced since it's broken (duplicate 3node names). 4 5diff --git a/Documentation/Makefile b/Documentation/Makefile 6index 26a2342bea..ceccd67ebb 100644 7--- a/Documentation/Makefile 8+++ b/Documentation/Makefile 9@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs 10 11 MAKEINFO = makeinfo 12 INSTALL_INFO = install-info 13-DOCBOOK2X_TEXI = docbook2x-texi 14+DOCBOOK2X_TEXI = docbook2texi 15 DBLATEX = dblatex 16 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex 17 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty 18@@ -250,7 +250,7 @@ man1: $(DOC_MAN1) 19 man5: $(DOC_MAN5) 20 man7: $(DOC_MAN7) 21 22-info: git.info gitman.info 23+info: git.info 24 25 pdf: user-manual.pdf 26 27@@ -266,10 +266,9 @@ install-man: man 28 29 install-info: info 30 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) 31- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) 32+ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir) 33 if test -r $(DESTDIR)$(infodir)/dir; then \ 34 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ 35- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ 36 else \ 37 echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ 38 fi