aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.port.subdir.mk
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2017-11-09 21:48:58 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2017-11-09 21:48:58 +0000
commitd2abf95cc9162443258c5ebe7c68a8ac15848568 (patch)
tree53e594c83ce07186837e6da5b9fb82894579f2f8 /Mk/bsd.port.subdir.mk
parent67ac62827ce500a2c95f75623cbdcdff1f186eb6 (diff)
downloadports-d2abf95cc9162443258c5ebe7c68a8ac15848568.tar.gz
ports-d2abf95cc9162443258c5ebe7c68a8ac15848568.zip
Ensure .CURDIR contains an absolute path without a trailing slash.
Problems can occur when PORTSDIR is a symbolic link, or e.g., make -C /usr/ports/ search key='!*' See also: r450002 https://lists.freebsd.org/pipermail/freebsd-current/2017-November/067386.html Submitted by: rum1cro@yandex.ru Reported by: sergey.dyatko@gmail.com Approved by: portmgr (bdrewery) Differential Revision: https://reviews.freebsd.org/D13019
Notes
Notes: svn path=/head/; revision=453873
Diffstat (limited to 'Mk/bsd.port.subdir.mk')
-rw-r--r--Mk/bsd.port.subdir.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 2321b62bfd44..8f1d3b3105cc 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -47,6 +47,11 @@ README= ${TEMPLATES}/README.category
MOVEDDIR?= ${PORTSDIR}
MOVEDFILE?= MOVED
+# Ensure .CURDIR contains an absolute path without a trailing slash. Failed
+# builds can occur when PORTSDIR is a symbolic link, or with something like
+# make -C /usr/ports/category/port/.
+.CURDIR:= ${.CURDIR:tA}
+
.include "${PORTSDIR}/Mk/bsd.commands.mk"
.MAIN: all