Date: Tue, 30 Jan 2024 22:18:56 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ce047ebf4848 - main - etc: Set DISTBASE during distribute for sub-makes Message-ID: <202401302218.40UMIuIH010541@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ce047ebf484867453508f38fa5336d6614c0f311 commit ce047ebf484867453508f38fa5336d6614c0f311 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-01-30 22:17:28 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> 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 <bsd.endian.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401302218.40UMIuIH010541>