Adjust Makefile so it honors passed variables better.

Add a small sed to e2fsprogs that allows test successes to
be properly identified.


git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11079 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Makefile

@@ -23,15 +23,15 @@ ifneq ($(REV), sysv)
 endif
 
 ifeq ($(REV), sysv)
-  BASEDIR         = ~/lfs-book
-  PDF_OUTPUT      = LFS-BOOK.pdf
-  NOCHUNKS_OUTPUT = LFS-BOOK.html
-  DUMPDIR         = ~/lfs-commands
+  BASEDIR         ?= ~/lfs-book
+  PDF_OUTPUT      ?= LFS-BOOK.pdf
+  NOCHUNKS_OUTPUT ?= LFS-BOOK.html
+  DUMPDIR         ?= ~/lfs-commands
 else
-  BASEDIR         = ~/lfs-systemd
-  PDF_OUTPUT      = LFS-SYSD-BOOK.pdf
-  NOCHUNKS_OUTPUT = LFS-SYSD-BOOK.html
-  DUMPDIR         = ~/lfs-sysd-commands
+  BASEDIR         ?= ~/lfs-systemd
+  PDF_OUTPUT      ?= LFS-SYSD-BOOK.pdf
+  NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
+  DUMPDIR         ?= ~/lfs-sysd-commands
 endif
 
 book: validate profile-html

chapter06/e2fsprogs.xml

@@ -44,6 +44,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>First, fix a script that adjusts testing output:</para>
+
+<screen><userinput remap="pre">sed -i -e 's:\[\.-\]::' tests/filter.sed</userinput></screen>
+
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>