aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-29 20:24:09 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2016-05-29 20:24:09 +0000
commit1aff37ff77dcce5f7387eea7e43aee9066282bc2 (patch)
tree9d37c6585d10f60282869bbb453213f6d1d79f78 /Makefile
parente787b1fe1487300d51ec7be69d3f98957c137453 (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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 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