[svnbook commit] r1117 - in trunk/src/nb: . book
sunny256 at red-bean.com
sunny256 at red-bean.com
Thu Feb 24 20:52:19 CST 2005
Author: sunny256
Date: Thu Feb 24 20:52:18 2005
New Revision: 1117
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/Makefile
trunk/src/nb/book/book.xml
Log:
Incorporate the changes from r1116 into the Norwegian book, the
en/tools/ directory is moved one level up. Also removed something in the
copytobuild rule which was forgotten in r1114.
* src/nb/LAST_UPDATED
Updated to r1116.
* src/nb/book/book.xml
Changed path to dblite.dtd .
* src/nb/Makefile
Merge changes from en/Makefile r1116.
(copytobuild): Removed two copy commands which should have been
deleted in r1114.
(sync): Added a merge command for the tools directory.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Thu Feb 24 20:52:18 2005
@@ -1 +1 @@
-1113
+1116
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Thu Feb 24 20:52:18 2005
@@ -7,6 +7,7 @@
SVNVERSION = svnversion
BOOK_TOP = .
+TOOLS_DIR = ../tools
BOOK_HTML_CHUNK_DIR = $(BOOK_DIR)/html-chunk
BOOK_DIR = ${BOOK_TOP}/book
BOOK_HTML_TARGET = $(BOOK_DIR)/svn-book.html
@@ -20,15 +21,15 @@
BOOK_IMAGES = $(BOOK_DIR)/images/*.png
BOOK_INSTALL_DIR = $(INSTALL_DIR)/book
-XSL_FO = ${BOOK_TOP}/../en/tools/fo-stylesheet.xsl
-XSL_HTML = $(BOOK_TOP)/../en/tools/html-stylesheet.xsl
-XSL_HTML_CHUNK = $(BOOK_TOP)/../en/tools/chunk-stylesheet.xsl
+XSL_FO = $(TOOLS_DIR)/fo-stylesheet.xsl
+XSL_HTML = $(TOOLS_DIR)/html-stylesheet.xsl
+XSL_HTML_CHUNK = $(TOOLS_DIR)/chunk-stylesheet.xsl
-RUN_FOP = ${BOOK_TOP}/../en/tools/bin/run-fop.sh
+RUN_FOP = $(TOOLS_DIR)/bin/run-fop.sh
# Book xsltproc options for HTML output
# Note: --stringparam arguments no longer go here;
-# see tools/html-stylesheet.xsl and tools/chunk-stylesheet.xsl
+# see ../tools/html-stylesheet.xsl and ../tools/chunk-stylesheet.xsl
BOOK_HTML_XSLTPROC_OPTS =
# Book xsltproc options for PDF and PostScript output
@@ -160,8 +161,6 @@
cp -a $(BOOK_HTML_TARGET) $(BUILDTMP_DIR)/
cp -a $(BOOK_IMAGES) $(BUILDTMP_DIR)/images/
cp -a $(BOOK_DIR)/styles.css $(BUILDTMP_DIR)/
- cp -a $(MDOCS_HTML_TARGET) $(BUILDTMP_DIR)/$(MDOCS_DIR)/
- cp -a $(BOOK_DIR)/styles.css $(BUILDTMP_DIR)/$(MDOCS_DIR)/
editmode:
$(MAKE) convfiles CONV_PARAM=-e
@@ -205,6 +204,7 @@
svnversion . >HEADREV
$(MAKE) editmode
svn merge -r$$(cat LAST_UPDATED):$$(cat HEADREV) $(COLLAB)/trunk/src/en .
+ svn merge -r$$(cat LAST_UPDATED):$$(cat HEADREV) $(COLLAB)/trunk/src/tools tools
mv HEADREV LAST_UPDATED
rmdir sync.LOCK
Modified: trunk/src/nb/book/book.xml
==============================================================================
--- trunk/src/nb/book/book.xml (original)
+++ trunk/src/nb/book/book.xml Thu Feb 24 20:52:18 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!-- @ENGLISH {{{
-<!DOCTYPE book SYSTEM "../tools/dtd/dblite.dtd"
+<!DOCTYPE book SYSTEM "../../tools/dtd/dblite.dtd"
[
<!ENTITY % vers SYSTEM "version.xml">
%vers;
@@ -24,7 +24,7 @@
<!ENTITY colo SYSTEM "colo.xml">
]>
@ENGLISH }}} -->
-<!DOCTYPE book SYSTEM "../../en/tools/dtd/dblite.dtd"
+<!DOCTYPE book SYSTEM "../../tools/dtd/dblite.dtd"
[
<!ENTITY % vers SYSTEM "version.xml">
%vers;
More information about the svnbook-dev
mailing list