From b98d0566b2bddb3478abe6f26cfde180920de092 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Fri, 25 Jul 2025 15:06:21 +0100 Subject: [PATCH] krb5: don't install /usr/include/import_err.h This header is not installed by upstream krb5, and since it's part of kdb5_util, installing it causes an unwanted krb5-dev package to be created. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51419 --- ObsoleteFiles.inc | 1 + krb5/usr.sbin/kdb5_util/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 0da710c9479..76c7b2eda4e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -62,6 +62,7 @@ OLD_FILES+=usr/include/t_test.h OLD_FILES+=usr/include/dyn.h OLD_FILES+=usr/include/dynP.h OLD_FILES+=usr/include/gssrpcint.h +OLD_FILES+=usr/include/import_err.h OLD_FILES+=usr/share/man/man5/profile.5.gz OLD_FILES+=usr/share/man/man8/kamdin.local.8.gz diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile index 1fab7ee5855..ef821d6867f 100644 --- a/krb5/usr.sbin/kdb5_util/Makefile +++ b/krb5/usr.sbin/kdb5_util/Makefile @@ -27,11 +27,12 @@ SRCS= dump.c \ tdumputil.c \ ${GEN} -INCS= ${GENI} +DPSRCS= ${GENI} MAN= kdb5_util.8 -CFLAGS+=-I${KRB5_DIR}/include \ +CFLAGS+=-I. \ + -I${KRB5_DIR}/include \ -I${KRB5_DIR}/lib \ -I${KRB5_SRCTOP}/include