pyrox.dev
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 -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
6--- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200
7+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200
8@@ -101,7 +101,7 @@
9
10 MAKEINFO = makeinfo
11 INSTALL_INFO = install-info
12-DOCBOOK2X_TEXI = docbook2x-texi
13+DOCBOOK2X_TEXI = docbook2texi
14 DBLATEX = dblatex
15 ifndef PERL_PATH
16 PERL_PATH = /usr/bin/perl
17@@ -205,7 +205,7 @@
18 man5: $(DOC_MAN5)
19 man7: $(DOC_MAN7)
20
21-info: git.info gitman.info
22+info: git.info
23
24 pdf: user-manual.pdf
25
26@@ -221,10 +221,9 @@
27
28 install-info: info
29 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
30- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
31+ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir)
32 if test -r $(DESTDIR)$(infodir)/dir; then \
33 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
34- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
35 else \
36 echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
37 fi