diff options
author | bde <bde@FreeBSD.org> | 2003-05-05 12:54:26 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2003-05-05 12:54:26 +0000 |
commit | c0fd079086a2a7e180efec292360922ca8af5851 (patch) | |
tree | 847dfcc6cba084585172083cd3f9fec492e7e3c3 | |
parent | 5e7892f0e3e78bff61a1f46b64afadae569bdf49 (diff) | |
download | FreeBSD-src-c0fd079086a2a7e180efec292360922ca8af5851.zip FreeBSD-src-c0fd079086a2a7e180efec292360922ca8af5851.tar.gz |
Install symlinks to individual headers instead of symlinks to directories
in the SHARED=symlinks case. Symlinks to directories only work if all the
the necessary headers are in 1 directory, but the necessary headers are
scattered for at least ipfilter headers in <netinet>. This change also
avoids polluting /usr/include with non-headers; the /usr/include hierarchy
is now independent of the setting of SHARED.
Submitted by: ru (edited to fix netgraph/bluetooth/include and machine/pc)
PR: 44148
-rw-r--r-- | Makefile.inc1 | 8 | ||||
-rw-r--r-- | include/Makefile | 106 |
2 files changed, 69 insertions, 45 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6456d90..989d016 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -279,14 +279,10 @@ _worldtmp: mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo diff --git a/include/Makefile b/include/Makefile index d5058e0..8a4b261 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,10 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # $FreeBSD$ # -# Doing a make install builds /usr/include -# -# The ``rm -rf''s used below are safe because rm doesn't follow symbolic -# links. +# Doing a "make install" builds /usr/include. CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc @@ -39,13 +36,10 @@ LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - netgraph/bluetooth/include \ security/mac_biba security/mac_bsdextended security/mac_lomac\ security/mac_mls security/mac_partition ufs/ffs ufs/ufs -# For SHARED=symlinks, cam, netatm, and netgraph are symlinks, so cam/scsi, -# netatm/*, and netgraph/* are taken care of -LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*} +LSUBSUBDIRS= netgraph/bluetooth/include # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is @@ -64,7 +58,7 @@ osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \ . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ - echo '#error "/usr/include/osreldate.h cannot be used in the kernel, use sys/param.h"' >> osreldate.h; \ + echo '#error "<osreldate.h> cannot be used in the kernel, use <sys/param.h>"' >> osreldate.h; \ echo "#else" >> osreldate.h; \ echo \#'undef __FreeBSD_version' >> osreldate.h; \ echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h; \ @@ -80,48 +74,82 @@ INCSLINKS+= machine/$i ${INCLUDEDIR}/$i INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i .endfor -copies: -.for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto - if [ -L ${DESTDIR}/usr/include/$i ]; then \ - rm -f ${DESTDIR}/usr/include/$i; \ +.include <bsd.prog.mk> + +installincludes: ${SHARED} +${SHARED}: compat + +# Take care of stale directory-level symlinks. +compat: +.for i in ${LDIRS} ${LSUBDIRS} machine crypto + if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \ + rm -f ${DESTDIR}${INCLUDEDIR}/$i; \ fi .endfor - mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ - -p ${DESTDIR}/usr/include -.for i in ${LDIRS} ${LSUBDIRS} + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ + -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ + -p ${DESTDIR}${INCLUDEDIR} + +copies: +.for i in ${LDIRS} ${LSUBDIRS} crypto machine machine/pc +.if exists(${DESTDIR}${INCLUDEDIR}/$i) + cd ${DESTDIR}${INCLUDEDIR}/$i; \ + for h in *.h; do \ + if [ -L $$h ]; then rm -f $$h; fi; \ + done +.endif +.endfor +.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} cd ${.CURDIR}/../sys; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ - ${DESTDIR}/usr/include/$i + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ + ${DESTDIR}${INCLUDEDIR}/$i .endfor cd ${.CURDIR}/../sys; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ - ${DESTDIR}/usr/include/crypto -.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include) + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ + ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}/usr/include/machine + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/machine .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}/usr/include/machine/pc -.endif + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/machine/pc .endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." .for i in ${LDIRS} - rm -rf ${DESTDIR}/usr/include/$i - ln -s ../../sys/$i ${DESTDIR}/usr/include/$i + cd ${.CURDIR}/../sys/$i; \ + for h in *.h; do \ + ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + done .endfor - rm -rf ${DESTDIR}/usr/include/crypto - ln -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto -.for i in ${LSYMSUBDIRS} - rm -rf ${DESTDIR}/usr/include/$i - ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i +.for i in ${LSUBDIRS} + cd ${.CURDIR}/../sys/$i; \ + for h in *.h; do \ + ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + done .endfor - rm -rf ${DESTDIR}/usr/include/machine - ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine - -.include <bsd.prog.mk> - -installincludes: ${SHARED} +.for i in ${LSUBSUBDIRS} + cd ${.CURDIR}/../sys/$i; \ + for h in *.h; do \ + ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + done +.endfor + cd ${.CURDIR}/../sys/opencrypto; \ + for h in *.h; do \ + ln -fs ../../../sys/opencrypto/$$h \ + ${DESTDIR}${INCLUDEDIR}/crypto; \ + done + cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ + for h in *.h; do \ + ln -fs ../../../sys/${MACHINE_ARCH}/include/$$h \ + ${DESTDIR}${INCLUDEDIR}/machine; \ + done +.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) + cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ + for h in *.h; do \ + ln -fs ../../../../sys/${MACHINE_ARCH}/include/pc/$$h \ + ${DESTDIR}${INCLUDEDIR}/machine/pc; \ + done +.endif |