r8210 - trunk/BOOK

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Jul 7 13:46:44 PDT 2007


Author: manuel
Date: 2007-07-07 14:46:44 -0600 (Sat, 07 Jul 2007)
New Revision: 8210

Modified:
   trunk/BOOK/Makefile
Log:
Using RENDERTMP envar instead of hardcoded /tmp dir.

Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile	2007-07-07 20:26:22 UTC (rev 8209)
+++ trunk/BOOK/Makefile	2007-07-07 20:46:44 UTC (rev 8210)
@@ -1,5 +1,6 @@
 BASEDIR=~/lfs-book
 DUMPDIR=~/lfs-commands
+RENDERTMP= $(HOME)/tmp
 CHUNK_QUIET=1
 ROOT_ID=""
 PDF_OUTPUT=LFS-BOOK.pdf
@@ -15,7 +16,7 @@
 	@echo "Generating chunked XHTML files..."
 	$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
 	  -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \
-	  stylesheets/lfs-chunked.xsl /tmp/lfs-html.xml
+	  stylesheets/lfs-chunked.xsl $(RENDERTMP)/lfs-html.xml
 
 	@echo "Copying CSS code and images..."
 	$(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
@@ -42,25 +43,26 @@
 pdf: validxml
 	@echo "Generating profiled XML for PDF..."
 	$(Q)xsltproc --nonet --stringparam profile.condition pdf \
-	  --output /tmp/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
-	  /tmp/lfs-full.xml
+	  --output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
+	  $(RENDERTMP)/lfs-full.xml
 
 	@echo "Generating FO file..."
 	$(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \
-	  --output /tmp//lfs-pdf.fo stylesheets/lfs-pdf.xsl /tmp/lfs-pdf.xml
-	$(Q)sed -i -e 's/span="inherit"/span="all"/' /tmp/lfs-pdf.fo
+	  --output $(RENDERTMP)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \
+	  $(RENDERTMP)/lfs-pdf.xml
+	$(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/lfs-pdf.fo
 
 	@echo "Generating PDF file..."
 	$(Q)if [ ! -e $(BASEDIR) ]; then \
 	  mkdir -p $(BASEDIR); \
 	fi;
-	$(Q)fop /tmp/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+	$(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
 nochunks: validxml profile-html
 	@echo "Generating non chunked XHTML file..."
 	$(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \
 	  --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-	  stylesheets/lfs-nochunks.xsl /tmp/lfs-html.xml
+	  stylesheets/lfs-nochunks.xsl $(RENDERTMP)/lfs-html.xml
 
 	@echo "Running Tidy..."
 	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@@ -69,16 +71,22 @@
 	$(Q)sed -i -e "s at text/html at application/xhtml+xml at g"  \
 	  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
-validxml:
+tmpdir:
+	@echo "Creating and cleaning $(RENDERTMP)"
+	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
+	$(Q)rm -f $(RENDERTMP)/lfs-{full,html,pdf}.xml
+	$(Q)rm -f $(RENDERTMP)/lfs-pdf.fo
+
+validxml: tmpdir
 	@echo "Validating the book..."
 	$(Q)xmllint --nonet --noent --xinclude --postvalid \
-	  -o /tmp/lfs-full.xml index.xml
+	  -o $(RENDERTMP)/lfs-full.xml index.xml
 
 profile-html: validxml
 	@echo "Generating profiled XML for XHTML..."
 	$(Q)xsltproc --nonet --stringparam profile.condition html \
-	  --output /tmp/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
-	  /tmp/lfs-full.xml
+	  --output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
+	  $(RENDERTMP)/lfs-full.xml
 
 wget-list:
 	@echo "Generating wget list..."
@@ -89,7 +97,7 @@
 dump-commands: validxml
 	@echo "Dumping book commands..."
 	$(Q)xsltproc --output $(DUMPDIR)/ \
-	   stylesheets/dump-commands.xsl /tmp/lfs-full.xml
+	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
 
 validate:
 	@echo "Validating the book..."
@@ -97,4 +105,5 @@
 
 all: lfs nochunks pdf dump-commands
 
-.PHONY : all dump-commands lfs nochunks pdf profile-html validate validxml wget-list
+.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \
+	 validxml wget-list




More information about the lfs-book mailing list