From owner-svn-src-all@FreeBSD.ORG  Wed Jun 12 13:17:44 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6C8D8A10;
 Wed, 12 Jun 2013 13:17:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5EEFA1BD2;
 Wed, 12 Jun 2013 13:17:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CDHiBv001400;
 Wed, 12 Jun 2013 13:17:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CDHiak001397;
 Wed, 12 Jun 2013 13:17:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306121317.r5CDHiak001397@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Jun 2013 13:17:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251653 - stable/9
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jun 2013 13:17:44 -0000

Author: gjb
Date: Wed Jun 12 13:17:43 2013
New Revision: 251653
URL: http://svnweb.freebsd.org/changeset/base/251653

Log:
  MFC r240403 (obrien):
    Not all Pmake derivatives silently handle empty shell output, so ensure
    there is something for make(1) to consume.  Bmake gives output such as:
    "warning: Couldn't read shell's output for "/bin/sh -c true"
  
  Approved by:	kib (mentor)

Modified:
  stable/9/Makefile   (contents, props changed)
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile
==============================================================================
--- stable/9/Makefile	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile	Wed Jun 12 13:17:43 2013	(r251653)
@@ -216,7 +216,7 @@ ${TGTS}:
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
-CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo
 .if !empty(CHECK_TIME)
 .error check your date/time: ${STARTTIME}
 .endif

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile.inc1	Wed Jun 12 13:17:43 2013	(r251653)
@@ -1658,7 +1658,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
 FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
-	${KERNCONFDIR}/${KERNCONF}
+	${KERNCONFDIR}/${KERNCONF} ; echo
 .endif
 .endif