[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn commit 5107 - doc/book/Makefile: This is wrong

From: Jani Averbach <jaa_at_cc.jyu.fi>
Date: 2003-02-26 08:01:10 CET

Hello!

I think that there is no need to do copying at all in book-html-chunk
target. It things should to do just the same as they are done in
book-html target.

You just have to remember to copy images and style.css when you are
installing chunk-book. $(BOOK_HTML_CHUNK_DIR) is just temporary working
place for chunk-target, and it will be wipe out by make clean.

If I missed something, please enlighten me, and I will remain silent.

BR, Jani

Index: doc/book/Makefile
===================================================================
--- doc/book/Makefile (revision 5108)
+++ doc/book/Makefile (working copy)
@@ -32,9 +32,10 @@

 RUN_FOP = ${BOOK_TOP}/tools/bin/run-fop.sh

+BOOK_CSS_FILE = styles.css
+BOOK_CSS_FILE_PATH = $(BOOK_DIR)/$(BOOK_CSS_FILE)
 # Book xsltproc options for HTML output
-BOOK_HTML_XSLTPROC_OPTS = --stringparam html.stylesheet styles.css
-BOOK_CHUNK_HTML_XSLTPROC_OPTS = stringparam html.stylesheet styles.css
+BOOK_HTML_XSLTPROC_OPTS = --stringparam html.stylesheet $(BOOK_CSS_FILE)

 # Book xsltproc options for PDF and PostScript output
 # BOOK_PDF_XSLTPROC_OPTS = --stringparam page.height 9in --stringparam
page.width 6.4in
@@ -74,8 +75,6 @@
        $(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
            --output $(BOOK_HTML_CHUNK_DIR)/ \
           $(XSL_HTML_CHUNK) $(BOOK_XML_SOURCE)
- cp -a $(BOOK_DIR)/styles.css $(BOOK_HTML_CHUNK_DIR)
- cp -a $(BOOK_DIR)/images/*.png $(BOOK_HTML_CHUNK_DIR)

 book-pdf: $(BOOK_PDF_TARGET)

@@ -97,12 +96,14 @@
 install-book-html: $(BOOK_HTML_TARGET)
        $(INSTALL) -d $(BOOK_INSTALL_DIR)/images
        $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR)
+ $(INSTALL) $(BOOK_CSS_FILE_PATH) $(BOOK_INSTALL_DIR)
        $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images

 ## index.html is created last
 install-book-html-chunk: $(BOOK_HTML_CHUNK_DIR)/index.html
        $(INSTALL) -d $(BOOK_INSTALL_DIR)/images
        $(INSTALL) $(BOOK_HTML_CHUNK_DIR)/*.html $(BOOK_INSTALL_DIR)
+ $(INSTALL) $(BOOK_CSS_FILE_PATH) $(BOOK_INSTALL_DIR)
        $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images

 install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)

--
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 26 08:02:06 2003

This is an archived mail posted to the Subversion Dev mailing list.