The branch main has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a245dc5d68c74bca8d00cd50e21e9544af6b21c9
commit a245dc5d68c74bca8d00cd50e21e9544af6b21c9
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-08-07 05:38:59 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2025-08-07 17:16:30 +0000
krb5: Move include/krb5_private to include/krb5
This maintains the krb5.h to krb5/krb5.h relationship during build
while still maintaining no interference from the other Makefile's
variables.
---
krb5/include/Makefile | 2 +-
krb5/include/krb5/Makefile | 23 ++++++++++++++++++--
krb5/include/krb5_private/Makefile | 43 --------------------------------------
3 files changed, 22 insertions(+), 46 deletions(-)
diff --git a/krb5/include/Makefile b/krb5/include/Makefile
index 6cd606faf605..699211b9c3c9 100644
--- a/krb5/include/Makefile
+++ b/krb5/include/Makefile
@@ -13,7 +13,7 @@ PACKAGE= kerberos-lib
.include "../Makefile.inc"
-SUBDIR= krb5_private krb5 gssrpc gssapi
+SUBDIR= krb5 gssrpc gssapi
SUBDIR_PARALLEL=
diff --git a/krb5/include/krb5/Makefile b/krb5/include/krb5/Makefile
index c560cf770924..2bbc558394c0 100644
--- a/krb5/include/krb5/Makefile
+++ b/krb5/include/krb5/Makefile
@@ -9,7 +9,11 @@
.include "../Makefile.inc"
-.PATH: ${KRB5_DIR}/include/krb5
+.PATH: ${KRB5_DIR}/include/krb5 \
+ ${KRB5_DIR}/lib/gssapi/krb5 \
+ ${KRB5_DIR}/lib/gssapi/generic \
+ ${KRB5_DIR}/include
+
INCSDIR= ${INCLUDEDIR}/krb5
INCS= ccselect_plugin.h \
@@ -24,6 +28,21 @@ INCS= ccselect_plugin.h \
locate_plugin.h \
plugin.h \
preauth_plugin.h \
- pwqual_plugin.h
+ pwqual_plugin.h \
+ krb5.h ${GGENI} ${K5GENI}
+
+.include "${KRB5_SRCTOP}/lib/krb5/error_tables/Makefile.inc"
+PFX= include
+.include "${KRB5_SRCTOP}/lib/gssapi/krb5/Makefile.et"
+.include "${KRB5_SRCTOP}/lib/gssapi/generic/Makefile.et"
+
+CLEANFILES+= krb5.h
+
+krb5.h: krb5.hin ${GENI_ET}
+ @echo "/* This file is generated, please don't edit it directly. */" >
${.TARGET}
+ @echo "#ifndef KRB5_KRB5_H_INCLUDED" >> ${.TARGET}
+ @echo "#define KRB5_KRB5_H_INCLUDED" >> ${.TARGET}
+ @cat ${.ALLSRC} >> ${.TARGET}
+ @echo "#endif /* KRB5_KRB5_H_INCLUDED */" >> ${.TARGET}
.include <bsd.prog.mk>
diff --git a/krb5/include/krb5_private/Makefile
b/krb5/include/krb5_private/Makefile
deleted file mode 100644
index 49520da22641..000000000000
--- a/krb5/include/krb5_private/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# SPDX-License-Idendifier: BSD-2-Clause
-#
-# Copyright (c) 2025 FreeBSD Foundation
-#
-# This sofware was developed by Cy Schubert <c...@freebsd.org>
-# under sponsorship from the FreeBSD Foundation.
-#
-
-.include "../Makefile.inc"
-
-# This is a bit of a hack but the reason we have to do this is
-# ${KRB5_DIR}/include/krb5/krb5.h is installed in /usr/include
-# while ${KRB5_DIR}/include/krb5/krb5.hin (generates to krb5.h)
-# installs to /usr/include/krb5/krb5.h. The conflicting files
-# makes it impossible to generate krb5.h when it already exists.
-# The MIT Makefile creates a krb5.h.new file, comparing it and
-# replacing it if different. Then regenerating the original source
-# to install it. Look at the MIT Makefile yourself to fully understand.
-
-.PATH: ${KRB5_DIR}/include/krb5 \
- ${KRB5_DIR}/lib/gssapi/krb5 \
- ${KRB5_DIR}/lib/gssapi/generic \
- ${KRB5_DIR}/include
-
-INCSDIR= ${INCLUDEDIR}/krb5
-INCS= krb5.h ${GGENI} ${K5GENI}
-
-.include "${KRB5_SRCTOP}/lib/krb5/error_tables/Makefile.inc"
-PFX= include
-.include "${KRB5_SRCTOP}/lib/gssapi/krb5/Makefile.et"
-.include "${KRB5_SRCTOP}/lib/gssapi/generic/Makefile.et"
-
-CLEANFILES+= krb5.h
-
-krb5.h: krb5.hin ${GENI_ET}
- @echo "/* This file is generated, please don't edit it directly. */" >
${.TARGET}
- @echo "#ifndef KRB5_KRB5_H_INCLUDED" >> ${.TARGET}
- @echo "#define KRB5_KRB5_H_INCLUDED" >> ${.TARGET}
- @cat ${.ALLSRC} >> ${.TARGET}
- @echo "#endif /* KRB5_KRB5_H_INCLUDED */" >> ${.TARGET}
-
-.include <bsd.prog.mk>
