diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-05-29 20:24:09 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2016-05-29 20:24:09 +0000 |
| commit | 1aff37ff77dcce5f7387eea7e43aee9066282bc2 (patch) | |
| tree | 9d37c6585d10f60282869bbb453213f6d1d79f78 | |
| parent | e787b1fe1487300d51ec7be69d3f98957c137453 (diff) | |
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
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | chapter06/e2fsprogs.xml | 4 |
2 files changed, 12 insertions, 8 deletions
@@ -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> |