From d32e83c26da3a0092cd4bb9737452e867d92b45f Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 4 Dec 2015 03:18:02 +0000 Subject: [PATCH] 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 --- include/Makefile | 2 ++ lib/Makefile | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/Makefile b/include/Makefile index bcdebb89dfe3..c75de6e3573d 100644 --- a/include/Makefile +++ b/include/Makefile @@ -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} diff --git a/lib/Makefile b/lib/Makefile index b44fe5fb735d..e1ee9a91da5d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -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