From owner-svn-src-head@freebsd.org  Fri Dec  4 03:18:04 2015
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 7DF0AA40D50;
 Fri,  4 Dec 2015 03:18:04 +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 1024D14C3;
 Fri,  4 Dec 2015 03:18:03 +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 tB43I3LD047591;
 Fri, 4 Dec 2015 03:18:03 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB43I2bn047589;
 Fri, 4 Dec 2015 03:18:02 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201512040318.tB43I2bn047589@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: Fri, 4 Dec 2015 03:18:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291740 - in head: include lib
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: Fri, 04 Dec 2015 03:18:04 -0000

Author: bdrewery
Date: Fri Dec  4 03:18:02 2015
New Revision: 291740
URL: https://svnweb.freebsd.org/changeset/base/291740

Log:
  Move obscure lib/ installation of /usr/lib/include symlink to include/.
  
  This avoids the need for an afterinstall: hook and a check for LIBRARIES_ONLY.
  It also now respects INCLUDEDIR.
  
  This came in r249484.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/include/Makefile
  head/lib/Makefile

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Fri Dec  4 03:17:59 2015	(r291739)
+++ head/include/Makefile	Fri Dec  4 03:18:02 2015	(r291740)
@@ -104,6 +104,8 @@ NEWVERS_SH=		${SYSDIR}/conf/newvers.sh
 PARAM_H=		${SYSDIR}/sys/param.h
 MK_OSRELDATE_SH=	${.CURDIR}/mk-osreldate.sh
 
+SYMLINKS+= ${INCLUDEDIR} ${LIBDIR}/include
+
 osreldate.h: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
 	env NEWVERS_SH=${NEWVERS_SH} PARAMFILE=${PARAM_H} SYSDIR=${SYSDIR} \
 	    sh ${MK_OSRELDATE_SH}

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Fri Dec  4 03:17:59 2015	(r291739)
+++ head/lib/Makefile	Fri Dec  4 03:18:02 2015	(r291740)
@@ -314,11 +314,6 @@ _libusbhid=	libusbhid
 _libusb=	libusb
 .endif
 
-.if !defined(LIBRARIES_ONLY)
-afterinstall:
-	${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include
-.endif
-
 .if !make(install)
 SUBDIR_PARALLEL=
 .endif