r1586 - trunk/BOOK

robert at linuxfromscratch.org robert at linuxfromscratch.org
Sat Nov 6 21:33:13 PDT 2010


Author: robert
Date: 2010-11-06 22:33:09 -0600 (Sat, 06 Nov 2010)
New Revision: 1586

Modified:
   trunk/BOOK/Makefile
   trunk/BOOK/lfs-bootscripts-20100627.tar.bz2
   trunk/BOOK/udev-config-20100128.tar.bz2
Log:
Fix Makefile, again, for hlfs.

Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile	2010-11-07 03:04:21 UTC (rev 1585)
+++ trunk/BOOK/Makefile	2010-11-07 04:33:09 UTC (rev 1586)
@@ -12,11 +12,11 @@
   Q = @
 endif
 
-lfs: maketar validxml profile-html
+hlfs: maketar 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/lfs-chunked.xsl $(RENDERTMP)/lfs-html.xml
+	  stylesheets/lfs-chunked.xsl $(RENDERTMP)/hlfs-html.xml
 
 	@echo "Copying CSS code and images..."
 	$(Q)if [ ! -e $(BASEDIR)/stylesheets ]; then \
@@ -43,27 +43,27 @@
 pdf: validxml
 	@echo "Generating profiled XML for PDF..."
 	$(Q)xsltproc --nonet --stringparam profile.condition pdf \
-	  --output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
-	  $(RENDERTMP)/lfs-full.xml
+	  --output $(RENDERTMP)/hlfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
+	  $(RENDERTMP)/hlfs-full.xml
 
 	@echo "Generating FO file..."
 	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-	  --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
-	$(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo
+	  --output $(RENDERTMP)/hlfs-pdf.fo stylesheets/lfs-pdf.xsl \
+	  $(RENDERTMP)/hlfs-pdf.xml
+	$(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/hlfs-pdf.fo
+	$(Q)bash pdf-fixups.sh $(RENDERTMP)/hlfs-pdf.fo
 
 	@echo "Generating PDF file..."
 	$(Q)if [ ! -e $(BASEDIR) ]; then \
 	  mkdir -p $(BASEDIR); \
 	fi;
-	$(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
+	$(Q)fop $(RENDERTMP)/hlfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
 
 nochunks: maketar validxml profile-html
 	@echo "Generating non chunked XHTML file..."
 	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
 	  --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
-	  stylesheets/lfs-nochunks.xsl $(RENDERTMP)/lfs-html.xml
+	  stylesheets/lfs-nochunks.xsl $(RENDERTMP)/hlfs-html.xml
 
 	@echo "Running Tidy..."
 	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@@ -75,17 +75,17 @@
 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
+	$(Q)rm -f $(RENDERTMP)/hlfs-{full,html,pdf}.xml
+	$(Q)rm -f $(RENDERTMP)/hlfs-pdf.fo
 
 validxml: tmpdir
 	@echo "Processing bootscripts..."
 	$(Q)bash process-scripts.sh
 	@echo "Validating the book..."
 	$(Q)xmllint --nonet --noent --xinclude --postvalid \
-	  -o $(RENDERTMP)/lfs-full.xml index.xml
+	  -o $(RENDERTMP)/hlfs-full.xml index.xml
 	$(Q)rm -f appendices/*.script
-	$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+	$(Q)./aux-file-data.sh $(RENDERTMP)/hlfs-full.xml
 
 maketar:
 	@echo "Making tarballs..."
@@ -94,8 +94,8 @@
 profile-html: validxml
 	@echo "Generating profiled XML for XHTML..."
 	$(Q)xsltproc --nonet --stringparam profile.condition html \
-	  --output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
-	  $(RENDERTMP)/lfs-full.xml
+	  --output $(RENDERTMP)/hlfs-html.xml stylesheets/lfs-xsl/profile.xsl \
+	  $(RENDERTMP)/hlfs-full.xml
 
 wget-list:
 	@echo "Generating wget list..."
@@ -106,12 +106,12 @@
 dump-commands: validxml
 	@echo "Dumping book commands..."
 	$(Q)xsltproc --output $(DUMPDIR)/ \
-	   stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
+	   stylesheets/dump-commands.xsl $(RENDERTMP)/hlfs-full.xml
 
 validate: maketar validxml
 	@echo "Validation complete."
 
-all: lfs nochunks pdf dump-commands
+all: hlfs nochunks pdf dump-commands
 
-.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \
+.PHONY : all dump-commands hlfs nochunks pdf profile-html tmpdir validate \
 	 validxml wget-list maketar

Modified: trunk/BOOK/lfs-bootscripts-20100627.tar.bz2
===================================================================
(Binary files differ)

Modified: trunk/BOOK/udev-config-20100128.tar.bz2
===================================================================
(Binary files differ)




More information about the hlfs-book mailing list