aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2005-01-05 22:42:00 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2005-01-05 22:42:00 +0000
commit529e4e5bd835333f59c80ed180816acefa83c960 (patch)
tree1b7b6fdda26833ae183c1e28bdb82f2323bc552d
parentb62a7039fcd688e5b4abe80768f436eb1a94b3b8 (diff)
One-step profiling for HTML output in testing.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/testing/BOOK@4503 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--Makefile17
-rw-r--r--stylesheets/lfs-chunked.xsl2
-rw-r--r--stylesheets/lfs-nochunks.xsl2
3 files changed, 6 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index e0a48db8c..4bf6f9488 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,8 @@ XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
lfs:
xsltproc --xinclude --nonet -stringparam profile.condition html \
- --output $(BASEDIR)/lfs-html.xml stylesheets/lfs-profile.xsl index.xml
-
- xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
- -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
- $(BASEDIR)/lfs-html.xml
+ -stringparam chunk.quietly $(CHUNK_QUIET) -stringparam base.dir $(BASEDIR)/ \
+ stylesheets/lfs-chunked.xsl index.xml
if [ ! -e $(BASEDIR)/stylesheets ]; then \
mkdir -p $(BASEDIR)/stylesheets; \
@@ -27,8 +24,6 @@ lfs:
cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
*.html
- rm $(BASEDIR)/lfs-html.xml
-
for filename in `find $(BASEDIR) -name "*.html"`; do \
tidy -config tidy.conf $$filename; \
true; \
@@ -62,12 +57,8 @@ pdf:
nochunks:
xsltproc --xinclude --nonet -stringparam profile.condition html \
- --output $(BASEDIR)/lfs-nochunk.xml stylesheets/lfs-profile.xsl index.xml
-
- xsltproc --nonet --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
- stylesheets/lfs-nochunks.xsl $(BASEDIR)/lfs-nochunk.xml
-
- rm $(BASEDIR)/lfs-nochunk.xml
+ --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
+ stylesheets/lfs-nochunks.xsl index.xml
tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
diff --git a/stylesheets/lfs-chunked.xsl b/stylesheets/lfs-chunked.xsl
index bfe985b7a..47b564447 100644
--- a/stylesheets/lfs-chunked.xsl
+++ b/stylesheets/lfs-chunked.xsl
@@ -24,7 +24,7 @@
Voila! (Man I hope we can do this better in XSLT 2.0) -->
- <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/chunk-code.xsl"/>
+ <xsl:include href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-chunk-code.xsl"/>
<!-- Including our others customized chunks templates -->
<xsl:include href="xhtml/lfs-legalnotice.xsl"/>
diff --git a/stylesheets/lfs-nochunks.xsl b/stylesheets/lfs-nochunks.xsl
index f3b2fb30a..375f1d8cd 100644
--- a/stylesheets/lfs-nochunks.xsl
+++ b/stylesheets/lfs-nochunks.xsl
@@ -5,7 +5,7 @@
version="1.0">
<!-- We use XHTML -->
- <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/docbook.xsl"/>
+ <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.67.2/xhtml/profile-docbook.xsl"/>
<!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
<xsl:output method="html" encoding="ISO-8859-1" indent="no" />