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

[BOOK PATCH]: Bug in makefile, make won't copy style.css

From: Jani Averbach <jaa_at_cc.jyu.fi>
Date: 2003-02-24 12:59:34 CET

Hello!

> rev 5061: cmpilato | 2003-02-24 12:39:16 +0200 (Mon, 24 Feb 2003) | 2 lines
>
> Abstractify Fitz's new optional xsltproc options.

Well, you should also remember to copy this beauty one (style.css). =)

Log:

Added copying of style.css to install-book-html* targets. Also added new
xsltproc options to the book-html-chunk target

* doc/book/Makefile:
  Added copying of style.css to book-html targets, and use
  BOOK_HTML_XSLTPROC_OPTS to generate book-html-chunk target

Index: doc/book/Makefile
===================================================================
--- doc/book/Makefile (revision 5061)
+++ doc/book/Makefile (working copy)
@@ -32,8 +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_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
@@ -67,10 +69,10 @@
        $(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) \
            --output $(BOOK_HTML_TARGET) $(XSL_HTML) $(BOOK_XML_SOURCE)

-## This trailing slash is essential that xsltproc will output pages to the dir
+## This trailing slash is essential so that xsltproc will output pages to the dir
 book-html-chunk: $(BOOK_ALL_SOURCE)
        mkdir -p $(BOOK_HTML_CHUNK_DIR)
- $(XSLTPROC) --output $(BOOK_HTML_CHUNK_DIR)/ \
+ $(XSLTPROC) $(BOOK_HTML_XSLTPROC_OPTS) --output $(BOOK_HTML_CHUNK_DIR)/ \
            $(XSL_HTML_CHUNK) $(BOOK_XML_SOURCE)

 book-pdf: $(BOOK_PDF_TARGET)
@@ -93,12 +95,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 Mon Feb 24 13:00:21 2003

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