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 @@ Installation of E2fsprogs + First, fix a script that adjusts testing output: + +sed -i -e 's:\[\.-\]::' tests/filter.sed + The E2fsprogs documentation recommends that the package be built in a subdirectory of the source tree: