diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2025-12-26 16:36:43 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2026-05-13 14:20:27 +0000 |
| commit | cc921088d9ee9ec0ba79893fdeaf271f2955a1bb (patch) | |
| tree | 0478924569bbb349e922e5915919e20a14bb1039 | |
| parent | f62ab5c293f64cf492c2a20ee99ded008e9a1457 (diff) | |
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)
(cherry picked from commit 61f0453b3aa71e640a42085f67ce556ca3283c6c)
| -rw-r--r-- | release/Makefile | 4 | ||||
| -rw-r--r-- | release/Makefile.vm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index d71449fa78bc..7dbded45e2e6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -36,7 +36,7 @@ # TARGET/TARGET_ARCH: architecture of built release # -WORLDDIR?= ${.CURDIR}/.. +WORLDDIR?= ${.CURDIR:H} PORTSDIR?= /usr/ports .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" @@ -57,7 +57,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 e0e69deaaf28..3533fe4b797f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -71,7 +71,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 |