From: ludo@gnu.org (Ludovic Courtès)
To: git@vger.kernel.org
Subject: [PATCH] Fix Info documentation build with Docbook2X 0.8.8
Date: Wed, 12 Mar 2008 16:30:10 +0100 [thread overview]
Message-ID: <87lk4o7yf1.fsf@inria.fr> (raw)
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
Hi,
The attached patch against 1.5.4.4 (from NixOS/Nixpkgs) fixes build of
the user manual in Info (i.e., `git.info') through Docbook2X 0.8.8.
Actually, it does two things:
1. Fix the value of `DOCBOOK2TEXI' to match the name currently used in
Docbook2X (I don't know when that name change occurred).
2. Disable build of `gitman.info', which cannot be built because of
duplicate node names:
$ makeinfo gitman.texi
gitman.texi:273: Node `DESCRIPTION' previously defined at line 153.
gitman.texi:281: Node `OPTIONS' previously defined at line 163.
gitman.texi:360: Node `DISCUSSION' previously defined at line 205.
[...]
A related patch against Docbook2X 0.8.8 is needed to make `--to-stdout'
work as expected [0].
Thanks,
Ludovic.
[0] http://sourceforge.net/tracker/index.php?func=detail&aid=1912754&group_id=7856&atid=107856
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: The patch --]
[-- Type: text/x-patch, Size: 1186 bytes --]
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
reply other threads:[~2008-03-12 15:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lk4o7yf1.fsf@inria.fr \
--to=ludo@gnu.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.