mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-07-22 20:25:04 +01:00
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
This commit is contained in:
parent
e787b1fe14
commit
1aff37ff77
16
Makefile
16
Makefile
@ -23,15 +23,15 @@ ifneq ($(REV), sysv)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(REV), sysv)
|
ifeq ($(REV), sysv)
|
||||||
BASEDIR = ~/lfs-book
|
BASEDIR ?= ~/lfs-book
|
||||||
PDF_OUTPUT = LFS-BOOK.pdf
|
PDF_OUTPUT ?= LFS-BOOK.pdf
|
||||||
NOCHUNKS_OUTPUT = LFS-BOOK.html
|
NOCHUNKS_OUTPUT ?= LFS-BOOK.html
|
||||||
DUMPDIR = ~/lfs-commands
|
DUMPDIR ?= ~/lfs-commands
|
||||||
else
|
else
|
||||||
BASEDIR = ~/lfs-systemd
|
BASEDIR ?= ~/lfs-systemd
|
||||||
PDF_OUTPUT = LFS-SYSD-BOOK.pdf
|
PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf
|
||||||
NOCHUNKS_OUTPUT = LFS-SYSD-BOOK.html
|
NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
|
||||||
DUMPDIR = ~/lfs-sysd-commands
|
DUMPDIR ?= ~/lfs-sysd-commands
|
||||||
endif
|
endif
|
||||||
|
|
||||||
book: validate profile-html
|
book: validate profile-html
|
||||||
|
@ -44,6 +44,10 @@
|
|||||||
<sect2 role="installation">
|
<sect2 role="installation">
|
||||||
<title>Installation of E2fsprogs</title>
|
<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
|
<para>The E2fsprogs documentation recommends that the package be built in
|
||||||
a subdirectory of the source tree: </para>
|
a subdirectory of the source tree: </para>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user