From nobody Tue Jan 30 22:18:56 2024 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 4TPfhc40xlz57jnc; Tue, 30 Jan 2024 22:18:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPfhc3WTxz52F8; Tue, 30 Jan 2024 22:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653136; 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=RNHrAkEWPM2aXSePcUQbG3yD2CTa+5iNHTqFuf84cIU=; b=iRqt5XAO5f+fHKYFsJUexGA55DOSXhqFt7tLAL1xBjHobz4F7XKZGIBgh/4JQ7XM34CCBX mswG4A/aNG1I1kGKvvs0ZwPeIEcxh0hULfDX35lmEriSyK/aeHVAEy56sScp9UcDZyU0k0 T4xm1XOd48/A4Lw8wUT95XgPgb24GzBMIk2S2gWOUStoUVwVDCDavpo9zzKTjK/bGOalf3 ZeF8z0Lm0BZWDAUYzLmNzcb7wJ7rRJ+L2drkKDZI2lhf6O0u4QkDSd/goKenI/H+QFmIWU gGGYR+j64xYLcRN8h6RT2fVn+EhD+REql9BlQD/5No8MbRz0L7XQ/yMA3C//6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653136; 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=RNHrAkEWPM2aXSePcUQbG3yD2CTa+5iNHTqFuf84cIU=; b=ap7uaao2phM7KJCEKs9tI2pJj5sLr4Iuh3Hx327aklYhHtSwOiNeyqjaYMfGqgvpOO4cev sCCUEUesdg7i2SbWGTHy3+Pk99PKOyKNxL6qQGsIvoSyxGe9QEXWcvctaBpdCZhFb3VE5b m1HPoMFCQcFYn8xzuyF/zUo1dXIvaNBsxThCLFQY0+0RhNilUaYv/FVwN8KkYEWGf5fFPB l+z9civlpq+PaHAhh4fuX3ng93QIiQgB5H/xRHHKmF134wVMz7VuiZqUMjNre/bwt+k+/y 22+pm1OKx4mLZIFo9GAUTjepMGWNX2hWd/lQeILlauZxYN6tcwDE5N/lcp+9iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706653136; a=rsa-sha256; cv=none; b=MvDI+zOgH5Mo1tzGdCwFnB/gWxaeCfOqtMYOQtFM57GAiwhfkWxox5D6ET5CzntBhWK0tO RG584MkdOu97Rp5eZWt41KKYNEfhcSWf21cw8QnFvzdVoPD90XKLgqSkc9TFx47C1nULIQ IwTjgLW0WTvk0zeBllTB8szhhoijWvzFcp5nJC840qU1YHluzWYbQUOnKIXXQCnZD5/yA3 QAOja4PFOy66RzvraizWXR4bGkOPRi6+8jw6AQXKBTgw8yao84ccpob+LMJb+RUNxvtb97 eO8ztEBnEb4MEU1tWeb8Hjn7rVf6S1N2cNmqmjzVZ4vREN7zR7ZZ1A7/tISQ0w== 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 4TPfhc2bKCzssx; Tue, 30 Jan 2024 22:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40UMIuTq010544; Tue, 30 Jan 2024 22:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UMIuIH010541; Tue, 30 Jan 2024 22:18:56 GMT (envelope-from git) Date: Tue, 30 Jan 2024 22:18:56 GMT Message-Id: <202401302218.40UMIuIH010541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ce047ebf4848 - main - etc: Set DISTBASE during distribute for sub-makes 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce047ebf484867453508f38fa5336d6614c0f311 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ce047ebf484867453508f38fa5336d6614c0f311 commit ce047ebf484867453508f38fa5336d6614c0f311 Author: Jessica Clarke AuthorDate: 2024-01-30 22:17:28 +0000 Commit: Jessica Clarke CommitDate: 2024-01-30 22:17:28 +0000 etc: Set DISTBASE during distribute for sub-makes This is normally done by bsd.subdir.mk in its default distribute target, but since etc overrides it we don't get that behaviour. Currently it's not needed, but share/man's makedb (recursed into by etc's afterinstall) will need it in the following commit. Technically this is only needed for install, but do this for distribution too for completeness and consistency. Reviewed by: brooks, emaste Differential Revision: https://reviews.freebsd.org/D43675 --- etc/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 097b7e3728bd..745ca91c60bf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -39,8 +39,9 @@ distribute: # Avoid installing tests here; "make distribution" will do this and # correctly place them in the right location. ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ - DESTDIR=${DISTDIR}/${DISTRIBUTION} - ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + DISTBASE=/${DISTRIBUTION} DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution \ + DISTBASE=/${DISTRIBUTION} DESTDIR=${DISTDIR}/${DISTRIBUTION} .include