aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--chapter06/e2fsprogs.xml4
2 files changed, 12 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index bb797199b..57de0ae74 100644
--- a/Makefile
+++ b/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
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index e7f7cf39b..678cfe40f 100644
--- a/chapter06/e2fsprogs.xml
+++ b/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>