2009-07-02 19:05:55 +02:00
|
|
|
This patch does two things: (1) use the right name for `docbook2texi',
|
|
|
|
|
and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
|
|
|
|
|
node names).
|
|
|
|
|
|
2013-09-30 17:18:48 +02:00
|
|
|
diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
|
|
|
|
|
--- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200
|
|
|
|
|
+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200
|
|
|
|
|
@@ -101,7 +101,7 @@
|
|
|
|
|
|
|
|
|
|
MAKEINFO = makeinfo
|
|
|
|
|
INSTALL_INFO = install-info
|
|
|
|
|
-DOCBOOK2X_TEXI = docbook2x-texi
|
|
|
|
|
+DOCBOOK2X_TEXI = docbook2texi
|
|
|
|
|
DBLATEX = dblatex
|
2008-03-12 16:21:45 +01:00
|
|
|
ifndef PERL_PATH
|
|
|
|
|
PERL_PATH = /usr/bin/perl
|
2013-09-30 17:18:48 +02:00
|
|
|
@@ -205,7 +205,7 @@
|
2008-03-12 16:21:45 +01:00
|
|
|
man5: $(DOC_MAN5)
|
|
|
|
|
man7: $(DOC_MAN7)
|
|
|
|
|
|
|
|
|
|
-info: git.info gitman.info
|
|
|
|
|
+info: git.info
|
|
|
|
|
|
2009-07-02 17:41:58 +02:00
|
|
|
pdf: user-manual.pdf
|
|
|
|
|
|
2013-09-30 17:18:48 +02:00
|
|
|
@@ -221,10 +221,9 @@
|
2008-03-12 16:21:45 +01:00
|
|
|
|
|
|
|
|
install-info: info
|
|
|
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
|
|
|
|
|
- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)
|
|
|
|
|
+ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir)
|
|
|
|
|
if test -r $(DESTDIR)$(infodir)/dir; then \
|
|
|
|
|
$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
|
|
|
|
|
- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\
|
|
|
|
|
else \
|
|
|
|
|
echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
|
|
|
|
|
fi
|
