Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jun 2010 16:52:35 +0000 (UTC)
From:      Rafal Jaworowski <raj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r209240 - head
Message-ID:  <201006161652.o5GGqZDo058561@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: raj
Date: Wed Jun 16 16:52:35 2010
New Revision: 209240
URL: http://svn.freebsd.org/changeset/base/209240

Log:
  Use awk alone for extracting FDT_DTS_FILE instead of grep/cut, which is
  simpler and more robust.
  
  Submitted by:	Andrzej Tobola

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Jun 16 16:39:01 2010	(r209239)
+++ head/Makefile.inc1	Wed Jun 16 16:52:35 2010	(r209240)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006161652.o5GGqZDo058561>