Changeset 1aff37f

Timestamp:

05/29/2016 08:24:09 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

18fcbd5

Parents:

e787b1f

Message:

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

Files:

• Makefile (modified) (1 diff)
• chapter06/e2fsprogs.xml (modified) (1 diff)

Makefile

@@ -24 +24 @@
 
 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
 

chapter06/e2fsprogs.xml

@@ -44 +44 @@
   <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