mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 04:46:43 +00:00
40 lines
1.3 KiB
Diff
40 lines
1.3 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).
|
|
|
|
diff -u -r -w git-1.6.3.3.orig/Documentation/Makefile git-1.6.3.3/Documentation/Makefile
|
|
--- git-1.6.3.3.orig/Documentation/Makefile 2009-07-02 17:07:17.000000000 +0200
|
|
+++ git-1.6.3.3/Documentation/Makefile 2009-07-02 17:08:49.000000000 +0200
|
|
@@ -51,7 +51,7 @@
|
|
infodir?=$(prefix)/share/info
|
|
MAKEINFO=makeinfo
|
|
INSTALL_INFO=install-info
|
|
-DOCBOOK2X_TEXI=docbook2x-texi
|
|
+DOCBOOK2X_TEXI=docbook2texi
|
|
DBLATEX=dblatex
|
|
ifndef PERL_PATH
|
|
PERL_PATH = /usr/bin/perl
|
|
@@ -153,7 +153,7 @@
|
|
man5: $(DOC_MAN5)
|
|
man7: $(DOC_MAN7)
|
|
|
|
-info: git.info gitman.info
|
|
+info: git.info
|
|
|
|
pdf: user-manual.pdf
|
|
|
|
@@ -169,10 +169,9 @@
|
|
|
|
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
|
|
Only in git-1.6.3.3/Documentation: Makefile.orig
|
|
Only in git-1.6.3.3/Documentation: Makefile.rej
|