Revert "include: Tag directly the last headers"

This reverts commit 839fc8cdf9.
This commit is contained in:
Emmanuel Vadot 2021-03-16 08:40:54 +01:00
parent c7e6cb9e08
commit 35b6d9b65e

View File

@ -43,7 +43,7 @@ LDIRS= geom net net80211 netgraph netinet netinet6 \
LSUBDIRS= dev/an dev/ciss dev/filemon dev/firewire \ LSUBDIRS= dev/an dev/ciss dev/filemon dev/firewire \
dev/hwpmc \ dev/hwpmc \
dev/ic dev/iicbus dev/if_wg dev/io dev/mfi dev/mmc dev/nvme \ dev/ic dev/iicbus if_wg dev/io dev/mfi dev/mmc dev/nvme \
dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/pwm \ dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/pwm \
dev/smbus dev/speaker dev/tcp_log dev/vkbd \ dev/smbus dev/speaker dev/tcp_log dev/vkbd \
fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \ fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \
@ -343,29 +343,29 @@ _installincludes:
-name "*.h" -print -delete || true -name "*.h" -print -delete || true
.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS}
cd ${SRCTOP}/sys; \ cd ${SRCTOP}/sys; \
${INSTALL} -C -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
${SDESTDIR}${INCLUDEDIR}/$i ${SDESTDIR}${INCLUDEDIR}/$i
.endfor .endfor
cd ${SRCTOP}/sys/${MACHINE}/include; \ cd ${SRCTOP}/sys/${MACHINE}/include; \
${INSTALL} -C -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${SDESTDIR}${INCLUDEDIR}/machine ${SDESTDIR}${INCLUDEDIR}/machine
.if exists(${SRCTOP}/sys/${MACHINE}/include/pc) .if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
cd ${SRCTOP}/sys/${MACHINE}/include/pc; \ cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
${INSTALL} -C -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${SDESTDIR}${INCLUDEDIR}/machine/pc ${SDESTDIR}${INCLUDEDIR}/machine/pc
.endif .endif
.for _MARCH in ${_MARCHS} .for _MARCH in ${_MARCHS}
.if exists(${SRCTOP}/sys/${_MARCH}/include) .if exists(${SRCTOP}/sys/${_MARCH}/include)
${INSTALL} -d -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 755 \ ${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${SDESTDIR}${INCLUDEDIR}/${_MARCH}; \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH}; \
cd ${SRCTOP}/sys/${_MARCH}/include; \ cd ${SRCTOP}/sys/${_MARCH}/include; \
${INSTALL} -C -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${SDESTDIR}${INCLUDEDIR}/${_MARCH} ${SDESTDIR}${INCLUDEDIR}/${_MARCH}
.if exists(${SRCTOP}/sys/${_MARCH}/include/pc) .if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
${INSTALL} -d -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 755 \ ${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
cd ${SRCTOP}/sys/${_MARCH}/include/pc; \ cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
${INSTALL} -C -T package=runtime,dev -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc ${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc
.endif .endif
.endif .endif