[svnbook commit] r1146 - in trunk/src/nb: . book

[sunny256 at red-bean.com]

Author: sunny256
Date: Thu Mar  3 15:58:42 2005
New Revision: 1146

Modified:
   trunk/src/nb/LAST_UPDATED
   trunk/src/nb/Makefile
   trunk/src/nb/book/book.xml
Log:
Merge changes between r1116:1145 from the English book into the 
Norwegian version.

* src/nb/LAST_UPDATED
  Updated to r1145 by make sync.

* src/nb/book/book.xml
  Merge r1142.

* src/nb/Makefile
  Merge r1121, r1125.


Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED	(original)
+++ trunk/src/nb/LAST_UPDATED	Thu Mar  3 15:58:42 2005
@@ -1 +1 @@
-1116
+1145

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Thu Mar  3 15:58:42 2005
@@ -1,3 +1,4 @@
+ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; then $(TOOLS_DIR)/find-xsl.py; fi
 XSLTPROC = xsltproc
 INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
 INSTALL = install
@@ -72,6 +73,7 @@
 book-html: $(BOOK_HTML_TARGET)
 
 $(BOOK_HTML_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE)
+	$(ENSURE_XSL)
 	$(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
            --output $(BOOK_HTML_TARGET) $(XSL_HTML) $(BOOK_XML_SOURCE)
 
@@ -82,6 +84,7 @@
                            $(BOOK_DIR)/styles.css $(BOOK_IMAGES)
 	mkdir -p $(BOOK_HTML_CHUNK_DIR)
 	mkdir -p $(BOOK_HTML_CHUNK_DIR)/images
+	$(ENSURE_XSL)
 	$(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
            --output $(BOOK_HTML_CHUNK_DIR)/ \
 	   $(XSL_HTML_CHUNK) $(BOOK_XML_SOURCE)
@@ -93,11 +96,13 @@
 book-ps: $(BOOK_PS_TARGET)
 
 $(BOOK_PDF_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE) $(BOOK_IMAGES)
+	$(ENSURE_XSL)
 	$(XSLTPROC) $(BOOK_PDF_XSLTPROC_OPTS) \
 	   --output $(BOOK_FO_TARGET) $(XSL_FO) $(BOOK_XML_SOURCE)
 	$(RUN_FOP) $(BOOK_TOP) -fo $(BOOK_FO_TARGET) -pdf $(BOOK_PDF_TARGET)
 
 $(BOOK_PS_TARGET): $(BOOK_ALL_SOURCE) $(BOOK_VERSION_SOURCE) $(BOOK_IMAGES)
+	$(ENSURE_XSL)
 	$(XSLTPROC) $(BOOK_PS_XSLTPROC_OPTS) \
 	   --output $(BOOK_FO_TARGET) $(XSL_FO) $(BOOK_XML_SOURCE)
 	$(RUN_FOP) $(BOOK_TOP) -fo $(BOOK_FO_TARGET) -ps $(BOOK_PS_TARGET)

Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml	(original)
+++ trunk/src/nb/book/book.xml	Thu Mar  3 15:58:42 2005
@@ -113,6 +113,7 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
+      <year>2005</year>
       <holder>Ben Collins-Sussman</holder>
       <holder>Brian W. Fitzpatrick</holder>
       <holder>C. Michael Pilato</holder>