Index: Makefile
===================================================================
--- Makefile	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ Makefile	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -1,58 +1,37 @@
-BASEDIR=~/lfs-book
-CHUNK_QUIET=0
-PDF_OUTPUT=LFS-BOOK.pdf
-NOCHUNKS_OUTPUT=LFS-BOOK.html
-XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
+BASEDIR=/home/macana/tmp/test-book-LFS/
 
 lfs:
-	xsltproc --xinclude --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-	  -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl \
-	  index.xml
+	xsltproc --xinclude --nonet --stringparam base.dir $(BASEDIR) \
+	  stylesheets/lfs-chunked.xsl index.xml
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	  mkdir -p $(BASEDIR)/stylesheets; \
-	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
+	mkdir -p $(BASEDIR)stylesheets && \
+	cp stylesheets/*.css $(BASEDIR)stylesheets
 
-	if [ ! -e $(BASEDIR)/images ]; then \
-	  mkdir -p $(BASEDIR)/images; \
-	fi;
-	cp $(XSLROOTDIR)/images/*.png \
-	  $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s@../stylesheets@stylesheets@g" \
+	mkdir -p $(BASEDIR)images && \
+	cp /usr/share/xml/docbook/xsl-stylesheets-1.65.1/images/*.png \
+	  $(BASEDIR)images
+
+	cd $(BASEDIR); sed -i -e "s@../stylesheets@stylesheets@g" \
 	  *.html
-	cd $(BASEDIR)/; sed -i -e "s@../images@images@g" \
+	cd $(BASEDIR); sed -i -e "s@../images@images@g" \
 	  *.html
 
-	sh goTidy $(BASEDIR)/
-
-#
-# This is the old "pdf" target. The old "print" target below has been
-# renamed to "pdf" and will be used. This commented out previous_pdf
-# target can be removed eventually. It'll remain here for a bit for
-# historical reasons
-#
-#previous_pdf:
-#	xsltproc --xinclude --nonet --output $(BASEDIR)/lfs.fo stylesheets/lfs-pdf.xsl \
-#	  index.xml
-#	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs.fo
-#	fop.sh $(BASEDIR)/lfs.fo $(BASEDIR)/$(PDF_OUTPUT)
-#	rm lfs.fo
+	cd $(BASEDIR); goTidy
 
 pdf:
-	xsltproc --xinclude --nonet --stringparam profile.condition print \
-		--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
-	sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo
-	fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/$(PDF_OUTPUT)
-	rm $(BASEDIR)/lfs-pdf.xml $(BASEDIR)/lfs-pdf.fo
+	xsltproc --xinclude --nonet --stringparam profile.condition print --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
+	cd $(BASEDIR); sed -i -e "s@inherit@all@" lfs-pdf.fo
+	cd $(BASEDIR); JAVA_HOME=/opt/java/jre1.3.1_02 FOP_HOME=/home/macana/tmp/fop \
+  /home/macana/tmp/fop/fop.sh lfs-pdf.fo lfs-pdf.pdf
 
 nochunks:
-	xsltproc --xinclude --nonet --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
+	xsltproc --xinclude --nonet --output $(BASEDIR)lfs-nochunk.html \
 	  stylesheets/lfs-nochunks.xsl index.xml
-	tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
+	tidy -config tidy.conf $(BASEDIR)lfs-nochunk.html || true
 
 validate:
 	xmllint --noout --nonet --xinclude --postvalid index.xml
+ 
 
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter05/binutils-pass1.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -55,5 +55,6 @@
 <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools --disable-nls</userinput></screen>
+<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools 
+    --disable-nls</userinput></screen>
 
 <para>The meaning of the configure options:</para>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/binutils.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -46,5 +46,6 @@
 set up for proper PTY operation:</para>
 
-<screen><computeroutput>The system has no more ptys.  Ask your system administrator to create more.</computeroutput></screen>
+<screen><computeroutput>The system has no more ptys.  
+Ask your system administrator to create more.</computeroutput></screen>
 
 <para>This issue needs to be resolved before running the test suites
@@ -59,5 +60,6 @@
 <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen>
+<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
+    --enable-shared</userinput></screen>
 
 <para>Compile the package:</para>
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/coreutils.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -40,5 +40,6 @@
 installed by other packages:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i \
+    ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen>
 
 <para>Now prepare Coreutils for compilation:</para>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/gcc.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -70,6 +70,7 @@
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++</userinput></screen>
+    --libexecdir=/usr/lib --enable-shared \
+    --enable-threads=posix --enable-__cxa_atexit \
+    --enable-clocale=gnu --enable-languages=c,c++</userinput></screen>
 
 <para>Compile the package:</para>
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/glibc.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -222,5 +222,6 @@
 running:</para>
 
-<screen><userinput>cp --remove-destination /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> /etc/localtime</userinput></screen>
+<screen><userinput>cp --remove-destination /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
+    /etc/localtime</userinput></screen>
 
 <para>Replace [xxx] with the name of the time zone that the
Index: chapter06/udev.xml
===================================================================
--- chapter06/udev.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/udev.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -50,5 +50,6 @@
 the configuration files here:</para>
 
-<screen><userinput>cp ../udev-config-2.permissions /etc/udev/permissions.d/25-lfs.permissions
+<screen><userinput>cp ../udev-config-2.permissions \
+    /etc/udev/permissions.d/25-lfs.permissions
 cp ../udev-config-1.rules /etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter06/util-linux.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -38,5 +38,6 @@
 following:</para>
 
-<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' hwclock/hwclock.c
+<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+    hwclock/hwclock.c
 mkdir -p /var/lib/hwclock</userinput></screen>
 
Index: chapter07/udev.xml
===================================================================
--- chapter07/udev.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter07/udev.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -208,5 +208,6 @@
 module, at the same time.</quote>  For example:</para>
 
-<screen><userinput>install snd-pcm modprobe -i snd-pcm ; modprobe snd-pcm-oss ; true</userinput></screen>
+<screen><userinput>install snd-pcm modprobe -i snd-pcm ; modprobe \
+    snd-pcm-oss ; true</userinput></screen>
 
 <para>This will cause the system to load both the
Index: chapter08/fstab.xml
===================================================================
--- chapter08/fstab.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter08/fstab.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -57,5 +57,5 @@
 devices:</para>
 
-<screen> usbfs         /proc/bus/usb usbfs   devgid=14,devmode=0660 0 0 </screen>
+<screen>usbfs        /proc/bus/usb usbfs   devgid=14,devmode=0660 0 0 </screen>
 
 <para>This option will only work if <quote>Support for Host-side
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ chapter08/kernel.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -54,5 +54,5 @@
 
 <screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to  keymap]</replaceable> &gt; \
-    <replaceable>[unpacked sources dir]</replaceable>/linux-&linux-version;/drivers/char/defkeymap.c</userinput></screen>
+    <replaceable>[sources dir]</replaceable>/linux-&linux-version;/drivers/char/defkeymap.c</userinput></screen>
 
 <para>For example, if using a Dutch keyboard, use
Index: prologue/typography.xml
===================================================================
--- prologue/typography.xml	(revision 3be2393920b03000e06adc119a9eb82004fc1a53)
+++ prologue/typography.xml	(revision 00cc7ce21921bc5fd76bf7b7024479b48b6a329e)
@@ -20,5 +20,5 @@
 referenced.</para>
 
-<screen><computeroutput>install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
+<screen><computeroutput>install-info: unknown option '--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
 
 <para>This form of text (fixed width text) shows screen output,
