The attached patch fixes general.pdf.  The texinfo manual suggests
that if you're having problems with macros with texi2dvi (and
texi2pdf), adding the -E macro expansion can fix it.  I tried it,
and it fixed it.

However, I recall that this came up in the past, and somebody said
that we shouldn't use -E for some reason.

Thoughts?

Cheers,
- Graham
>From ee0ac2eeea723233963d383c7caf2a80c0b999c7 Mon Sep 17 00:00:00 2001
From: Graham Percival <[email protected]>
Date: Thu, 13 Aug 2009 18:59:56 -0700
Subject: [PATCH] Doc: change build system to fix broken macros in tex/pdf.

---
 Documentation/GNUmakefile           |    2 +-
 stepmake/stepmake/texinfo-vars.make |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e7e7f08..8fc6737 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -53,7 +53,7 @@ OUT_TEXINFO_MANUALS = $(TEXINFO_MANUALS:%=$(outdir)/%.texi)
 # of the NR
 TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 
-PDF_FILES = $(subst $(outdir)/general.pdf,,$(TEXINFO_MANUALS:%=$(outdir)/%.pdf))
+PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 UNSPLITTED_HTML_MANUALS = changes
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 5489d0e..c06f2e5 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -41,7 +41,7 @@ TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 
-TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
+TEXI2PDF_FLAGS += -E $(DOCUMENTATION_INCLUDES)
 
 ifdef QUIET_BUILD
 TEXI2PDF_FLAGS += -q
-- 
1.5.6.5

_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to