Date: Tue, 24 Jun 2025 15:06:13 GMT From: Cy Schubert <cy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cbb6e747af98 - main - krb5/include: com_err.h and verto.h installed by krb5/util Message-ID: <202506241506.55OF6DSj009977@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cbb6e747af982206e4646fc1b1685c4f3b29f378 commit cbb6e747af982206e4646fc1b1685c4f3b29f378 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2025-06-24 14:47:52 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2025-06-24 15:06:00 +0000 krb5/include: com_err.h and verto.h installed by krb5/util krb5/util/et and krb5/util/verto install com_err.h and verto.h respectively. Do not install them again. This causes pkgbase conflicts. Reported by: fluffy Fixes: ee3960cba106 --- krb5/include/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/krb5/include/Makefile b/krb5/include/Makefile index fb919434bf93..0a2ceaebb689 100644 --- a/krb5/include/Makefile +++ b/krb5/include/Makefile @@ -17,7 +17,7 @@ SUBDIR= krb5_private krb5 gssrpc gssapi SUBDIR_PARALLEL= -INCSGROUPS= INCS COM_ERR VERTO GSSAPI_KRB5 +INCSGROUPS= INCS GSSAPI_KRB5 INCSDIR= ${INCLUDEDIR} @@ -47,25 +47,11 @@ SDESTDIR?= ${SYSROOT:U${DESTDIR}} .PHONY: force rebuild-error-tables osconf.h -.PATH: ${KRB5_DIR}/util/et -COM_ERRDIR= ${INCLUDEDIR} -COM_ERR= com_err.h - -.PATH: ${KRB5_DIR}/util/verto -VERTODIR= ${INCLUDEDIR} -VERTO= verto-module.h \ - verto.h - .PATH: ${KRB5_DIR}/include/krb5 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; \ - ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${COM_ERR} ${SDESTDIR}${INCLUDEDIR} - cd ${KRB5_DIR}/util/verto; \ - ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${VERTO} ${SDESTDIR}${INCLUDEDIR} - .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506241506.55OF6DSj009977>