The branch main has been updated by manu:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=35b6d9b65e54ac4ce50c380d8e5915a0d2f32346

commit 35b6d9b65e54ac4ce50c380d8e5915a0d2f32346
Author:     Emmanuel Vadot <[email protected]>
AuthorDate: 2021-03-16 07:40:54 +0000
Commit:     Emmanuel Vadot <[email protected]>
CommitDate: 2021-03-16 07:40:54 +0000

    Revert "include: Tag directly the last headers"
    
    This reverts commit 839fc8cdf9b6bafe120e7da8a4b78950ad7295c4.
---
 include/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index 5618cfcacfa6..e0df8571ae73 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -43,7 +43,7 @@ LDIRS=        geom net net80211 netgraph netinet netinet6 \
 
 LSUBDIRS=      dev/an dev/ciss dev/filemon dev/firewire \
        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/smbus dev/speaker dev/tcp_log dev/vkbd \
        fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \
@@ -343,29 +343,29 @@ _installincludes:
            -name "*.h" -print -delete || true
 .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS}
        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
 .endfor
        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
 .if exists(${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
 .endif
 .for _MARCH in ${_MARCHS}
 .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}; \
        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}
 .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; \
        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
 .endif
 .endif
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to