From nobody Mon Jun 23 16:21:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bQtcV1wHQz60VJ2; Mon, 23 Jun 2025 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQtcV18TQz46f9; Mon, 23 Jun 2025 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750695674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8BxXlSJL5D5O8oz2NVHmGf0YO+9tyjnjA8fFdBElho=; b=PdQutrNbRqDVtOT9Xh/6NRA/iLUV6cOifsQ89PD2v/CM5fsMBkEvszU6hS9WnLpWcn43It QNF+wUmh4jdCmMBbvi/AzJB/mEaMM9KRmOolNGJaZ2FLRbgMIiG1Z2bOYXRbr2TpZ3R4zx IjGbOzRWy2jPtUGqemGGeVlLNCQmYd9eIG/57MbQBnV8JOe77I6ANvtzLgzdKt0SkL+lt0 bpsc35y/jwNS3iftPEQW00t8xPi0cYw6uxqi4QTzp/BuRexuPBpY8sve81gdKOEG1AK2ee zI6O38FbGgFqYbEu83KbJQVMG6+vv2HB4dL7qzdbAFJlVjq3T9vttC26AxRUKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750695674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8BxXlSJL5D5O8oz2NVHmGf0YO+9tyjnjA8fFdBElho=; b=Ko4LjSfFPr6d8CH2vvcJQ25p9AwpZZhKkV+xGPPTA6B9+gra5p70vqY7kdiN9ZSfjv/Opz mOh9yJGvOu9hyk43iFkl50UhWmpB6TSgsvksv4qOVSp+zapxqbg0NYyi5f8RO6Mk2L1hvI WsAXkg1rHROZF5bfLyTAeJzY67zd1NO/+FcyXMVeTCDJIKizKb9B0SMrg0YgctP3w3alEe 67fZlUEg5KY98Cd8CVHDSNuO8Bl03A8PKqxPajtsrnkoWiraPZPy+FDTtS/qIR4knoqssn NMpvI+x3XvYsvYhkYXnpl4oVMi+NjOHXCeXduke5qPLyeLNDbVVEG5bH+3+Gng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750695674; a=rsa-sha256; cv=none; b=cuQX8Uy/vzzwwku/R0dPX8sJcY3x14QdZHaU7WdMMkjo0kdJAO4VaKAAXhSl98qDNtyDyw SLaibEYlLud0J1BqAkcKLtxdKPQweBOmNvl/uRRaKJro410FkeM0N8kMCHc7aDfmB0B7VF fjjck+yJAX4Dp+cu6B3jstl+oASFrBUxP0GBz51V43MOb8znWG2gjDILmM0Ohx655Wj68k 6agHT3iPBMW7Gr/2SPg+RBgIqQKDL4HGYyDODd8i5gmwqjU1zhDaXO057XnzNyJr8s3UUv S1nkc4i1dAR7q/gMuP5YzfP7vIJ+TRZXFA0iS3ctilJoB2HF7xRdVA+xC42ZkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bQtcV0g7cz18Z5; Mon, 23 Jun 2025 16:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55NGLDGa041538; Mon, 23 Jun 2025 16:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NGLDoq041535; Mon, 23 Jun 2025 16:21:13 GMT (envelope-from git) Date: Mon, 23 Jun 2025 16:21:13 GMT Message-Id: <202506231621.55NGLDoq041535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 60f970b85e44 - main - krb5: Fix install /usr/include INCS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60f970b85e44644d76daa4faa8a8d45e490dbde1 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=60f970b85e44644d76daa4faa8a8d45e490dbde1 commit 60f970b85e44644d76daa4faa8a8d45e490dbde1 Author: Cy Schubert AuthorDate: 2025-06-23 14:21:05 +0000 Commit: Cy Schubert 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 - 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 + +installincludes: copies