svn commit: r291740 - in head: include lib

[Bryan Drewery]

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