37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
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).
|
||
|
|
|
||
|
|
--- git-1.5.4.4/Documentation/Makefile~ 2008-03-09 11:18:13.000000000 +0100
|
||
|
|
+++ git-1.5.4.4/Documentation/Makefile 2008-03-12 16:04:05.000000000 +0100
|
||
|
|
@@ -53,7 +53,7 @@ DOC_REF = origin/man
|
||
|
|
infodir?=$(prefix)/share/info
|
||
|
|
MAKEINFO=makeinfo
|
||
|
|
INSTALL_INFO=install-info
|
||
|
|
-DOCBOOK2X_TEXI=docbook2x-texi
|
||
|
|
+DOCBOOK2X_TEXI=docbook2texi
|
||
|
|
ifndef PERL_PATH
|
||
|
|
PERL_PATH = /usr/bin/perl
|
||
|
|
endif
|
||
|
|
@@ -89,7 +89,7 @@ man1: $(DOC_MAN1)
|
||
|
|
man5: $(DOC_MAN5)
|
||
|
|
man7: $(DOC_MAN7)
|
||
|
|
|
||
|
|
-info: git.info gitman.info
|
||
|
|
+info: git.info
|
||
|
|
|
||
|
|
install: man
|
||
|
|
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
|
||
|
|
@@ -101,10 +101,9 @@ install: man
|
||
|
|
|
||
|
|
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
|