git: 3949c2b8c469 - main - release: Use make's `:H` rather than `/..`
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jan 2026 16:49:31 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=3949c2b8c4691a6dff8be7b38805d56faab91187
commit 3949c2b8c4691a6dff8be7b38805d56faab91187
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-12-26 16:36:43 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-01-05 16:49:04 +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
---
release/Makefile | 4 ++--
release/Makefile.vm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/release/Makefile b/release/Makefile
index fc91b31df579..230eb66fc077 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