{"thread":{"id":"12650","subject":"[PATCH] Fix Info documentation build with Docbook2X 0.8.8","startedAt":"2008-03-12T15:30:10Z","lastAt":"2008-03-12T15:30:10Z","messageCount":1,"participants":["Ludovic Courtès"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"71813","messageId":"87lk4o7yf1.fsf@inria.fr","threadId":"12650","inReplyTo":null,"subject":"[PATCH] Fix Info documentation build with Docbook2X 0.8.8","fromName":"Ludovic Courtès","fromEmail":"ludo@gnu.org","sentAt":"2008-03-12T15:30:10Z","receivedAt":"2008-03-12T15:30:10Z","isPatch":true,"sender":{"key":"ludo@gnu.org","avatar":null},"body":"Hi,\n\nThe attached patch against 1.5.4.4 (from NixOS/Nixpkgs) fixes build of\nthe user manual in Info (i.e., `git.info') through Docbook2X 0.8.8.\nActually, it does two things:\n\n  1. Fix the value of `DOCBOOK2TEXI' to match the name currently used in\n     Docbook2X (I don't know when that name change occurred).\n\n  2. Disable build of `gitman.info', which cannot be built because of\n     duplicate node names:\n\n     $ makeinfo gitman.texi\n     gitman.texi:273: Node `DESCRIPTION' previously defined at line 153.\n     gitman.texi:281: Node `OPTIONS' previously defined at line 163.\n     gitman.texi:360: Node `DISCUSSION' previously defined at line 205.\n     [...]\n\nA related patch against Docbook2X 0.8.8 is needed to make `--to-stdout'\nwork as expected [0].\n\nThanks,\nLudovic.\n\n[0] http://sourceforge.net/tracker/index.php?func=detail&aid=1912754&group_id=7856&atid=107856\n\n\n\nThis patch does two things: (1) use the right name for `docbook2texi',\nand (2) make sure `gitman.info' isn't produced since it's broken (duplicate\nnode names).\n\n--- git-1.5.4.4/Documentation/Makefile~\t2008-03-09 11:18:13.000000000 +0100\n+++ git-1.5.4.4/Documentation/Makefile\t2008-03-12 16:04:05.000000000 +0100\n@@ -53,7 +53,7 @@ DOC_REF = origin/man\n infodir?=$(prefix)/share/info\n MAKEINFO=makeinfo\n INSTALL_INFO=install-info\n-DOCBOOK2X_TEXI=docbook2x-texi\n+DOCBOOK2X_TEXI=docbook2texi\n ifndef PERL_PATH\n \tPERL_PATH = /usr/bin/perl\n endif\n@@ -89,7 +89,7 @@ man1: $(DOC_MAN1)\n man5: $(DOC_MAN5)\n man7: $(DOC_MAN7)\n \n-info: git.info gitman.info\n+info: git.info\n \n install: man\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)\n@@ -101,10 +101,9 @@ install: man\n \n install-info: info\n \t$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)\n-\t$(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir)\n+\t$(INSTALL) -m 644 git.info $(DESTDIR)$(infodir)\n \tif test -r $(DESTDIR)$(infodir)/dir; then \\\n \t  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\\\n-\t  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\\\n \telse \\\n \t  echo \"No directory found in $(DESTDIR)$(infodir)\" >&2 ; \\\n \tfi\n"}]}