summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorraj <raj@FreeBSD.org>2010-06-16 16:52:35 +0000
committerraj <raj@FreeBSD.org>2010-06-16 16:52:35 +0000
commit331d2f7657d26626a6e75e90203cf8c44fdabeca (patch)
treed0f6d988fef0a95aeb3825f79ab8501cf450ded5
parent54db007c1621af260c397af683d4634a84908b51 (diff)
downloadFreeBSD-src-331d2f7657d26626a6e75e90203cf8c44fdabeca.zip
FreeBSD-src-331d2f7657d26626a6e75e90203cf8c44fdabeca.tar.gz
Use awk alone for extracting FDT_DTS_FILE instead of grep/cut, which is
simpler and more robust. Submitted by: Andrzej Tobola
-rw-r--r--Makefile.inc14
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 59b6629..149ab65 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1458,8 +1458,8 @@ _xi-links:
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-FDT_DTS_FILE!= grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \
- ${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2
+FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \
+ ${KERNCONFDIR}/${KERNCONF}
.endif
.endif
OpenPOWER on IntegriCloud