r162 - in trunk/BOOK: . chapter03

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Feb 11 12:09:21 PST 2005


Author: manuel
Date: 2005-02-11 13:09:21 -0700 (Fri, 11 Feb 2005)
New Revision: 162

Modified:
   trunk/BOOK/Makefile
   trunk/BOOK/chapter03/patches.xml
Log:
Fixed the name of the uClibc patches.

Modified: trunk/BOOK/Makefile
===================================================================
--- trunk/BOOK/Makefile	2005-02-11 19:51:56 UTC (rev 161)
+++ trunk/BOOK/Makefile	2005-02-11 20:09:21 UTC (rev 162)
@@ -1,29 +1,55 @@
 BASEDIR=~/hlfs-book
 CHUNK_QUIET=0
-PDF_OUTPUT=HLFS-BOOK.pdf
-NOCHUNKS_OUTPUT=HLFS-BOOK.html
+PDF_OUTPUT=HLFS-BOOK-$(LIBC).pdf
+NOCHUNKS_OUTPUT=HLFS-BOOK-$(LIBC).html
 XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
+LIBC=glibc
 
 hlfs:
-	xsltproc --xinclude --nonet -stringparam profile.condition html \
-	-stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/ \
+# top-level index.html
+	xsltproc --nonet --output $(BASEDIR)/index.html stylesheets/top-index.xsl prologue/bookinfo.xml
+
+# glibc
+	xsltproc --xinclude --nonet -stringparam profile.condition html,glibc \
+	-stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/glibc/ \
 	stylesheets/lfs-chunked.xsl index.xml
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	  mkdir -p $(BASEDIR)/stylesheets; \
+	if [ ! -e $(BASEDIR)/glibc/stylesheets ]; then \
+	  mkdir -p $(BASEDIR)/glibc/stylesheets; \
 	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
+	cp stylesheets/*.css $(BASEDIR)/glibc/stylesheets
 
-	if [ ! -e $(BASEDIR)/images ]; then \
-	  mkdir -p $(BASEDIR)/images; \
+	if [ ! -e $(BASEDIR)/glibc/images ]; then \
+	  mkdir -p $(BASEDIR)/glibc//images; \
 	fi;
 	cp $(XSLROOTDIR)/images/*.png \
-	  $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s at ../stylesheets at stylesheets@g" \
+	  $(BASEDIR)/glibc/images
+	cd $(BASEDIR)/glibc/; sed -i -e "s at ../stylesheets at stylesheets@g" \
 	  *.html
-	cd $(BASEDIR)/; sed -i -e "s at ../images at images@g" \
+	cd $(BASEDIR)/glibc/; sed -i -e "s at ../images at images@g" \
 	  *.html
 
+# uclibc
+	xsltproc --xinclude --nonet -stringparam profile.condition html,uclibc \
+	-stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/uclibc/ \
+	stylesheets/lfs-chunked.xsl index.xml
+
+	if [ ! -e $(BASEDIR)/uclibc/stylesheets ]; then \
+	  mkdir -p $(BASEDIR)/uclibc/stylesheets; \
+	fi;
+	cp stylesheets/*.css $(BASEDIR)/uclibc/stylesheets
+
+	if [ ! -e $(BASEDIR)/uclibc/images ]; then \
+	  mkdir -p $(BASEDIR)/uclibc//images; \
+	fi;
+	cp $(XSLROOTDIR)/images/*.png \
+	  $(BASEDIR)/uclibc/images
+	cd $(BASEDIR)/uclibc/; sed -i -e "s at ../stylesheets at stylesheets@g" \
+	  *.html
+	cd $(BASEDIR)/uclibc/; sed -i -e "s at ../images at images@g" \
+	  *.html
+
+# common stuff
 	for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  tidy -config tidy.conf $$filename; \
 	  true; \
@@ -34,7 +60,7 @@
 	done;
 
 pdf:
-	xsltproc --xinclude --nonet --stringparam profile.condition pdf \
+	xsltproc --xinclude --nonet --stringparam profile.condition pdf,$(LIBC) \
 		--output $(BASEDIR)/lfs-pdf.xml stylesheets/lfs-profile.xsl index.xml
 	xsltproc --nonet --output $(BASEDIR)/lfs-pdf.fo stylesheets/lfs-pdf.xsl \
 		$(BASEDIR)/lfs-pdf.xml
@@ -43,7 +69,7 @@
 	rm $(BASEDIR)/lfs-pdf.xml $(BASEDIR)/lfs-pdf.fo
 
 nochunks:
-	xsltproc --xinclude --nonet -stringparam profile.condition html \
+	xsltproc --xinclude --nonet -stringparam profile.condition html,$(LIBC) \
 	--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
 	  stylesheets/lfs-nochunks.xsl index.xml
 

Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml	2005-02-11 19:51:56 UTC (rev 161)
+++ trunk/BOOK/chapter03/patches.xml	2005-02-11 20:09:21 UTC (rev 162)
@@ -311,14 +311,14 @@
 <varlistentry>
 <term>uClibc Configure Patch - ? KB:</term>
 <listitem>
-<para><ulink url="&patches-root;uclibc-&uclibc-version;-uClibc-0.9.27-config-1.patch"/></para>
+<para><ulink url="&patches-root;uClibc-&uclibc-version;-config-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>uClibc SSP Patch - ? KB:</term>
 <listitem> 
-<para><ulink url="&patches-root;uclibc-&uclibc-version;-uClibc-0.9.27-ssp-2.patch"/></para>
+<para><ulink url="&patches-root;uClibc-&uclibc-version;-ssp-2.patch"/></para>
 </listitem>
 </varlistentry>
 




More information about the hlfs-dev mailing list