From owner-svn-src-head@FreeBSD.ORG  Wed Jun 16 16:52:36 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CACD1065679;
	Wed, 16 Jun 2010 16:52:36 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CBA58FC16;
	Wed, 16 Jun 2010 16:52:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5GGqZeL058563;
	Wed, 16 Jun 2010 16:52:35 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5GGqZDo058561;
	Wed, 16 Jun 2010 16:52:35 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201006161652.o5GGqZDo058561@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Wed, 16 Jun 2010 16:52:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209240 - head
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jun 2010 16:52:36 -0000

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