[svnbook commit] r1894 - trunk/src/tools

maxb svnbook-dev at red-bean.com
Fri Dec 9 05:38:26 CST 2005


Author: maxb
Date: Fri Dec  9 05:38:22 2005
New Revision: 1894

Modified:
   trunk/src/tools/Makefile.base
   trunk/src/tools/Makefile.base-vars
   trunk/src/tools/fo-stylesheet.xsl

Log:
Tweaks with the aim of enhancing the re-usability of the buildsystem elsewhere.

* src/tools/Makefile.base-vars
  (INSTALL_DIR, OUTNAME): Make generic.

* src/tools/Makefile.base
  (INSTALL_DIR, OUTNAME): Override with specifics.

* src/tools/fo-stylesheet.xsl: Refer to admonition graphics relative to .fo
    file, not relative to FOP invocation directory.


Modified: trunk/src/tools/Makefile.base
==============================================================================
--- trunk/src/tools/Makefile.base	(original)
+++ trunk/src/tools/Makefile.base	Fri Dec  9 05:38:22 2005
@@ -5,8 +5,10 @@
 
 include ../tools/Makefile.base-vars
 NAME = book
+OUTNAME = svn-book
 DIR = book
 IMAGES = $(DIR)/images/*.png
+INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
 include ../tools/Makefile.base-rules
 
 # Compatibility targets - the book buildsystem had quite target names which

Modified: trunk/src/tools/Makefile.base-vars
==============================================================================
--- trunk/src/tools/Makefile.base-vars	(original)
+++ trunk/src/tools/Makefile.base-vars	Fri Dec  9 05:38:22 2005
@@ -24,7 +24,7 @@
 # Paths which you may wish to customize:
 XSLTPROC = xsltproc
 XMLLINT = xmllint
-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
+INSTALL_DIR = $(DESTDIR)/usr/share/doc/OVERRIDE_ME_WITH_SOMETHING_SUITABLE
 INSTALL = install
 SVNVERSION = svnversion
 
@@ -35,7 +35,7 @@
 DIR = .
 IMAGES =
 TOOLS_DIR = ../tools
-OUTNAME = svn-$(NAME)
+OUTNAME = $(NAME)
 
 HTML_CHUNK_DIR = $(DIR)/html-chunk
 HTML_TARGET = $(DIR)/$(OUTNAME).html

Modified: trunk/src/tools/fo-stylesheet.xsl
==============================================================================
--- trunk/src/tools/fo-stylesheet.xsl	(original)
+++ trunk/src/tools/fo-stylesheet.xsl	Fri Dec  9 05:38:22 2005
@@ -5,6 +5,6 @@
   <xsl:param name="fop.extensions" select="1" />
   <xsl:param name="variablelist.as.blocks" select="1" />
   <xsl:param name="admon.graphics" select="1" />
-  <xsl:param name="admon.graphics.path">book/images/</xsl:param>
+  <xsl:param name="admon.graphics.path">images/</xsl:param>
   <xsl:param name="admon.graphics.extension">.png</xsl:param>
 </xsl:stylesheet>




More information about the svnbook-dev mailing list