From adf0149474f65bbfb3340d3d6d9398e742f95ccf Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sat, 7 Jul 2007 16:12:44 +0000 Subject: [PATCH] Changed TMPDIR by RENDERTMP. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6852 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- Makefile | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 971fdb47ee..b29770c6b1 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # Adjust these to suit your installation BASEDIR= $(HOME)/public_html/blfs-book-xsl DUMPDIR= $(HOME)/blfs-commands -TMPDIR= $(HOME)/tmp +RENDERTMP= $(HOME)/tmp CHUNK_QUIET=1 ROOT_ID="" PDF_OUTPUT=BLFS-BOOK.pdf @@ -23,7 +23,7 @@ blfs: validxml profile-html @echo "Generating chunked XHTML files..." $(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \ -stringparam rootid $(ROOT_ID) -stringparam base.dir $(BASEDIR)/ \ - stylesheets/blfs-chunked.xsl $(TMPDIR)/blfs-html.xml + stylesheets/blfs-chunked.xsl $(RENDERTMP)/blfs-html.xml @echo "Copying CSS code and images..." $(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \ @@ -48,25 +48,25 @@ blfs: validxml profile-html pdf: validxml @echo "Generating profiled XML for PDF..." $(Q)xsltproc --nonet --stringparam profile.condition pdf \ - --output $(TMPDIR)/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \ - $(TMPDIR)/blfs-full.xml + --output $(RENDERTMP)/blfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \ + $(RENDERTMP)/blfs-full.xml @echo "Generating FO file..." $(Q)xsltproc --nonet -stringparam rootid $(ROOT_ID) \ - --output $(TMPDIR)/blfs-pdf.fo stylesheets/blfs-pdf.xsl $(TMPDIR)/blfs-pdf.xml - $(Q)sed -i -e 's/span="inherit"/span="all"/' $(TMPDIR)/blfs-pdf.fo + --output $(RENDERTMP)/blfs-pdf.fo stylesheets/blfs-pdf.xsl $(RENDERTMP)/blfs-pdf.xml + $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/blfs-pdf.fo @echo "Generating PDF file..." $(Q)if [ ! -e $(BASEDIR) ]; then \ mkdir -p $(BASEDIR); \ fi; - $(Q)fop $(TMPDIR)/blfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT) + $(Q)fop $(RENDERTMP)/blfs-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/blfs-nochunks.xsl $(TMPDIR)/blfs-html.xml + stylesheets/blfs-nochunks.xsl $(RENDERTMP)/blfs-html.xml @echo "Running Tidy..." $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true @@ -76,41 +76,41 @@ nochunks: validxml profile-html $(BASEDIR)/$(NOCHUNKS_OUTPUT) tmpdir: - @echo "Creating and cleaning $(TMPDIR) - $(Q)[ -d $(TMPDIR) ] || mkdir -p $(TMPDIR) - $(Q)rm -f $(TMPDIR)/blfs-{full,html,pdf,fo,}.xml - $(Q)rm -f $(TMPDIR)/blfs-{patch-list,patches} + @echo "Creating and cleaning $(RENDERTMP) + $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP) + $(Q)rm -f $(RENDERTMP)/blfs-{full,html,pdf,fo,}.xml + $(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches} validxml: tmpdir @echo "Validating the book..." $(Q)xmllint --nonet --noent --xinclude --postvalid \ - -o ~$(TMPDIR)/blfs-full.xml index.xml + -o ~$(RENDERTMP)/blfs-full.xml index.xml profile-html: validxml @echo "Generating profiled XML for XHTML..." $(Q)xsltproc --nonet --stringparam profile.condition html \ - --output $(TMPDIR)/blfs-html.xml stylesheets/lfs-xsl/profile.xsl \ - $(TMPDIR)/blfs-full.xml + --output $(RENDERTMP)/blfs-html.xml stylesheets/lfs-xsl/profile.xsl \ + $(RENDERTMP)/blfs-full.xml blfs-patch-list: validxml @echo "Generating blfs-patch-list..." - $(Q)xsltproc --nonet --output $(TMPDIR)/blfs-patch-list \ - stylesheets/patcheslist.xsl $(TMPDIR)/blfs-full.xml - $(Q)sed -e "s|^.*/||" $(TMPDIR)/blfs-patch-list > $(TMPDIR)/blfs-patches - $(Q)sort $(TMPDIR)/blfs-patches > blfs-patch-list + $(Q)xsltproc --nonet --output $(RENDERTMP)/blfs-patch-list \ + stylesheets/patcheslist.xsl $(RENDERTMP)/blfs-full.xml + $(Q)sed -e "s|^.*/||" $(RENDERTMP)/blfs-patch-list > $(RENDERTMP)/blfs-patches + $(Q)sort $(RENDERTMP)/blfs-patches > blfs-patch-list wget-list: validxml @echo "Generating wget list..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet --output $(BASEDIR)/wget-list \ - stylesheets/wget-list.xsl $(TMPDIR)/blfs-full.xml + stylesheets/wget-list.xsl $(RENDERTMP)/blfs-full.xml test-links: validxml @echo "Generating test-links file..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet --stringparam list_mode full \ --output $(BASEDIR)/test-links stylesheets/wget-list.xsl \ - $(TMPDIR)/blfs-full.xml + $(RENDERTMP)/blfs-full.xml @echo "Checking URLs, first pass..." $(Q)rm -f $(BASEDIR)/{good,bad,true_bad}_urls @@ -132,7 +132,7 @@ test-links: validxml dump-commands: validxml @echo "Dumping book commands..." $(Q)xsltproc --output $(DUMPDIR)/ \ - stylesheets/dump-commands.xsl $(TMPDIR)/blfs-full.xml + stylesheets/dump-commands.xsl $(RENDERTMP)/blfs-full.xml validate: @echo "Validating the book..."