summaryrefslogtreecommitdiffstats
path: root/share/mk/bsd.files.mk
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-01-04 19:19:48 +0000
committergjb <gjb@FreeBSD.org>2016-01-04 19:19:48 +0000
commitccde53b74b7bd32198439bfa247743fbf4c91a76 (patch)
tree3882b41d5bbb0e4ad065fa3392bf2eab80a3d4e3 /share/mk/bsd.files.mk
parent04942f20347330d49715904f537ca62d33372684 (diff)
parentc9ef17cbe9e3b753415472a271916c098cab7780 (diff)
downloadFreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.zip
FreeBSD-src-ccde53b74b7bd32198439bfa247743fbf4c91a76.tar.gz
MFH r289384-r293170
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'share/mk/bsd.files.mk')
-rw-r--r--share/mk/bsd.files.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index f4c96e8..448ac38 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -30,7 +30,6 @@ ${group}DIR?= ${BINDIR}
STAGE_SETS+= ${group}
.endif
STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
-STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}
.if defined(NO_ROOT)
.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
@@ -44,7 +43,7 @@ _${group}FILES=
.for file in ${${group}}
.if defined(${group}OWN_${file:T}) || defined(${group}GRP_${file:T}) || \
defined(${group}MODE_${file:T}) || defined(${group}DIR_${file:T}) || \
- defined(${group}NAME_${file:T})
+ defined(${group}NAME_${file:T}) || defined(${group}NAME)
${group}OWN_${file:T}?= ${${group}OWN}
${group}GRP_${file:T}?= ${${group}GRP}
${group}MODE_${file:T}?= ${${group}MODE}
@@ -83,7 +82,7 @@ _${group}INS: ${_${group}FILES}
${DESTDIR}${${group}DIR}/${${group}NAME}
.else
${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
.endif
.endif
OpenPOWER on IntegriCloud