Author: matthew
Date: 2012-03-05 13:16:58 -0700 (Mon, 05 Mar 2012)
New Revision: 9762
Modified:
trunk/BOOK/Makefile
trunk/BOOK/aux-file-data.sh
Log:
Allow aux-file-data.sh to be run successfully from the command line, and rename
validxml target to validate. Thanks to Pierre Labastie for the report.
Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile 2012-03-03 23:22:06 UTC (rev 9761)
+++ trunk/BOOK/Makefile 2012-03-05 20:16:58 UTC (rev 9762)
@@ -13,7 +13,7 @@
Q = @
endif
-lfs: maketar validxml profile-html
+lfs: validate profile-html
@echo "Generating chunked XHTML files..."
$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-stringparam rootid "$(ROOT_ID)" -stringparam base.dir $(BASEDIR)/ \
@@ -41,7 +41,7 @@
$(Q)$(MAKE) wget-list
-pdf: validxml
+pdf: validate
@echo "Generating profiled XML for PDF..."
$(Q)xsltproc --nonet --stringparam profile.condition pdf \
--output $(RENDERTMP)/lfs-pdf.xml stylesheets/lfs-xsl/profile.xsl \
@@ -60,7 +60,7 @@
fi;
$(Q)fop $(RENDERTMP)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-nochunks: maketar validxml profile-html
+nochunks: validate profile-html
@echo "Generating non chunked XHTML file..."
$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
@@ -82,7 +82,7 @@
$(Q)rm -f $(RENDERTMP)/lfs-{full,html,pdf}.xml
$(Q)rm -f $(RENDERTMP)/lfs-pdf.fo
-validxml: tmpdir
+validate: tmpdir
@echo "Processing bootscripts..."
$(Q)bash process-scripts.sh
@echo "Validating the book..."
@@ -90,14 +90,9 @@
-o $(RENDERTMP)/lfs-full.xml index.xml
$(Q)rm -f appendices/*.script
$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
+ @echo "Validation complete."
-maketar:
- $(Q)if [ "x$(MAKETAR)" == "x" ]; then \
- echo "Making tarballs..."; \
- sh make-aux-files.sh; \
- fi;
-
-profile-html: validxml
+profile-html: validate
@echo "Generating profiled XML for XHTML..."
$(Q)xsltproc --nonet --stringparam profile.condition html \
--output $(RENDERTMP)/lfs-html.xml stylesheets/lfs-xsl/profile.xsl \
@@ -120,15 +115,13 @@
$(BASEDIR)/md5sums
-dump-commands: validxml
+dump-commands: validate
@echo "Dumping book commands..."
$(Q)xsltproc --output $(DUMPDIR)/ \
stylesheets/dump-commands.xsl $(RENDERTMP)/lfs-full.xml
-validate: maketar validxml
- @echo "Validation complete."
all: lfs nochunks pdf dump-commands md5sums
.PHONY : all dump-commands lfs nochunks pdf profile-html tmpdir validate \
- validxml wget-list maketar md5sums
+ validate wget-list maketar md5sums
Modified: trunk/BOOK/aux-file-data.sh
===================================================================
--- trunk/BOOK/aux-file-data.sh 2012-03-03 23:22:06 UTC (rev 9761)
+++ trunk/BOOK/aux-file-data.sh 2012-03-05 20:16:58 UTC (rev 9762)
@@ -7,6 +7,8 @@
FILE=$1
+./make-aux-files.sh
+
# Bootscript data
bootscripts=$(ls lfs-bootscripts*.bz2)
base=$(basename $bootscripts .tar.bz2)
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
