Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 23 Mar 2026 16:41:17 +0000
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 61f0453b3aa7 - stable/15 - release: Use make's `:H` rather than `/..`
Message-ID:  <69c16d2d.32848.5c02b834@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=61f0453b3aa71e640a42085f67ce556ca3283c6c

commit 61f0453b3aa71e640a42085f67ce556ca3283c6c
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-12-26 16:36:43 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-03-23 16:40:35 +0000

    release: Use make's `:H` rather than `/..`
    
    In general we want to strip subdir components, rather than appending
    `..`s.
    
    Reviewed by:    lwhsu
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D54373
    
    (cherry picked from commit 3949c2b8c4691a6dff8be7b38805d56faab91187)
---
 release/Makefile    | 4 ++--
 release/Makefile.vm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 2469385408ee..c6112faff947 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -40,7 +40,7 @@
 #  TARGET/TARGET_ARCH: architecture of built release
 #
 
-WORLDDIR?=	${.CURDIR}/..
+WORLDDIR?=	${.CURDIR:H}
 PORTSDIR?=	/usr/ports
 
 .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk"
@@ -62,7 +62,7 @@ DISTDIR=	dist
 # Define OSRELEASE by using newvers.sh
 .if !defined(OSRELEASE) || empty(OSRELEASE)
 .for _V in TYPE BRANCH REVISION
-${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
+${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V}
 .endfor
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 142fd6e7bdf5..3e5f4936b518 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -73,7 +73,7 @@ CLOUDWARE?=	${CLOUDWARE_GEN}
 
 .for _V in TYPE BRANCH REVISION
 . if !defined(${_V}) || empty(${_V})
-${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
+${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V}
 . endif
 .endfor
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c16d2d.32848.5c02b834>