The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=60f970b85e44644d76daa4faa8a8d45e490dbde1
commit 60f970b85e44644d76daa4faa8a8d45e490dbde1
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-06-23 14:21:05 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2025-06-23 16:20:26 +0000
krb5: Fix install /usr/include INCS
Build and install of subdirs does not need to include bsd.subdir.mk.
As with include/, copies must always be built. And installincludes is
placed after bsd.prog.mk.
Reported by: fluffy
---
krb5/include/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/krb5/include/Makefile b/krb5/include/Makefile
index ee086e1ea07d..fb919434bf93 100644
--- a/krb5/include/Makefile
+++ b/krb5/include/Makefile
@@ -17,8 +17,6 @@ SUBDIR= krb5_private krb5 gssrpc gssapi
SUBDIR_PARALLEL=
-.include <bsd.subdir.mk>
-
INCSGROUPS= INCS COM_ERR VERTO GSSAPI_KRB5
INCSDIR= ${INCLUDEDIR}
@@ -45,7 +43,6 @@ rebuild-error-tables: ${K5_ET_HEADERS}
force:
stage_includes: copies
-installincludes: copies
SDESTDIR?= ${SYSROOT:U${DESTDIR}}
.PHONY: force rebuild-error-tables osconf.h
@@ -61,7 +58,7 @@ VERTO= verto-module.h \
.PATH: ${KRB5_DIR}/include/krb5
-copies:
+copies: .PHONY .META
cd ${KRB5_DIR}/include; \
${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP}
-m444 ${INCS} ${SDESTDIR}${INCLUDEDIR}
cd ${KRB5_DIR}/util/et; \
@@ -71,3 +68,5 @@ copies:
.include <bsd.prog.mk>
+
+installincludes: copies
