From owner-svn-src-head@freebsd.org  Thu Jan  7 19:19:24 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3BF1A6605A;
 Thu,  7 Jan 2016 19:19:24 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A0FD71D44;
 Thu,  7 Jan 2016 19:19:24 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07JJNmH009198;
 Thu, 7 Jan 2016 19:19:23 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07JJNFT009196;
 Thu, 7 Jan 2016 19:19:23 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201601071919.u07JJNFT009196@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 7 Jan 2016 19:19:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293341 - in head: lib/libstand sys/boot/libstand32
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2016 19:19:24 -0000

Author: bdrewery
Date: Thu Jan  7 19:19:23 2016
New Revision: 293341
URL: https://svnweb.freebsd.org/changeset/base/293341

Log:
  Don't install /usr/include/stand.h twice after r293040.
  
  Only install it from lib/libstand.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/libstand/Makefile
  head/sys/boot/libstand32/Makefile

Modified: head/lib/libstand/Makefile
==============================================================================
--- head/lib/libstand/Makefile	Thu Jan  7 18:50:02 2016	(r293340)
+++ head/lib/libstand/Makefile	Thu Jan  7 19:19:23 2016	(r293341)
@@ -17,7 +17,7 @@ LIBC_SRC=	${LIBSTAND_SRC}/../libc
 
 LIB=		stand
 NO_PIC=
-INCS=		stand.h
+INCS?=		stand.h
 MAN?=		libstand.3
 
 WARNS?=		0

Modified: head/sys/boot/libstand32/Makefile
==============================================================================
--- head/sys/boot/libstand32/Makefile	Thu Jan  7 18:50:02 2016	(r293340)
+++ head/sys/boot/libstand32/Makefile	Thu Jan  7 19:19:23 2016	(r293341)
@@ -10,6 +10,7 @@ LIBSTAND_CPUARCH=${MACHINE_CPUARCH}
 .endif
 LIBC_SRC=	${LIBSTAND_SRC}/../libc
 INTERNALLIB=
+INCS=
 MAN=
 .PATH:	${LIBSTAND_SRC}