summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-04 03:18:02 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-04 03:18:02 +0000
commit38174a7667de4ae9a0a33ede1f08554c5c47db42 (patch)
tree4f416aa03a3c5eec0c1a026beb94269873657e05
parent7c19435a8dcdd38f3d1fda294ae8d7ae0b0e006e (diff)
downloadFreeBSD-src-38174a7667de4ae9a0a33ede1f08554c5c47db42.zip
FreeBSD-src-38174a7667de4ae9a0a33ede1f08554c5c47db42.tar.gz
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
-rw-r--r--include/Makefile2
-rw-r--r--lib/Makefile5
2 files changed, 2 insertions, 5 deletions
diff --git a/include/Makefile b/include/Makefile
index bcdebb8..c75de6e 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 b44fe5f..e1ee9a9 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
OpenPOWER on IntegriCloud