The changes in r5129 override any customization to FO_XSLTPROC_OPTS in

Makefile.base-vars. Since the different language branches seems to add
customizations in the main Makefile, move everything there.

* en/Makefile: Add HTML_XSLTPROC_OPTS and FO_XSLTPROC_OPTS and comments

* en/README: Add a note on how to build the pdf with custom options

* tools/Makefile.base-vars: Remove HTML_XSLTPROC_OPTS and FO_XSLTPROC_OPTS

git-svn-id: https://svn.code.sf.net/p/svnbook/source/trunk@6041 b70f5e92-ccc6-4167-9ab2-d027528d294b

diff --git a/en/Makefile b/en/Makefile
index 47446e4..1136c9e 100644 (file)
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,3 +1,14 @@
 include ../tools/Makefile.base
-FO_XSLTPROC_OPTS = --param fop1.extensions 1
+
+# Customization hooks for xsltproc options
+
+# Customization for the html target
+HTML_XSLTPROC_OPTS = 
+
+# Customization for the pdf target
+# Examples
+# Custom page size: --stringparam page.height 9in --stringparam page.width 6.4in
+# Paper type A4: --stringparam paper.type A4
+FO_XSLTPROC_OPTS =
+
 L10N_REVISION = r

diff --git a/en/README b/en/README
index a6d2837..183ae3d 100644 (file)
--- a/en/README
+++ b/en/README
@@ -132,6 +132,9 @@ II. COMPILING THE DOCS
 
      Poof!  You now have PNG support.
 
+   * If you want to customize the output, for example change the paper
+     type, check the FO_XSLTPROC_OPTS variable in en/Makefile.
+     
    * From this directory (en, or another language directory), do 
 
         $ make all-pdf

diff --git a/tools/Makefile.base-vars b/tools/Makefile.base-vars
index 9711fda..8aee1e4 100644 (file)
--- a/tools/Makefile.base-vars
+++ b/tools/Makefile.base-vars
@@ -67,14 +67,6 @@ ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; \
 IFIMAGES = if test -n "$(IMAGES)"; then
 ENDIF = ; fi
 
-# Customization hooks for xsltproc options
-HTML_XSLTPROC_OPTS = 
-FO_XSLTPROC_OPTS =
-# FO example: --stringparam page.height 9in --stringparam page.width 6.4in
-
-# Uncomment the following line if you'd like to print on A4 paper
-# FO_XSLTPROC_OPTS = --stringparam paper.type A4
-
 # Override in locale-specific Makefile to localize the word in the 
 # auto-generated version file.
 L10N_REVISION = Revision