svn commit: r352942 - head/share/mk
Simon J. Gerraty
sjg at FreeBSD.org
Tue Oct 1 20:32:04 UTC 2019
Author: sjg
Date: Tue Oct 1 20:32:03 2019
New Revision: 352942
URL: https://svnweb.freebsd.org/changeset/base/352942
Log:
Need to use ${${_${group}DIR_${file}}} for STAGE_DIR
STAGE_DIR.${${_${group}DIR_${file}}:C,[/*],_,g} was getting
${STAGE_OBJTOP}BINDIR rather than
${STAGE_OBJTOP}${BINDIR} when FILESDIR=BINDIR
Reviewed by: stevek
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D21858
Modified:
head/share/mk/bsd.files.mk
Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk Tue Oct 1 20:22:54 2019 (r352941)
+++ head/share/mk/bsd.files.mk Tue Oct 1 20:32:03 2019 (r352942)
@@ -109,7 +109,7 @@ STAGE_AS_${file}= ${${group}NAME_${file}}
# we need to expand ${group}DIR_${file} and replace
# all '/' and '*' with '_' to make a safe target name.
STAGE_AS_SETS+= ${${_${group}DIR_${file}}:C,[/*],_,g}
-STAGE_DIR.${${_${group}DIR_${file}}:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR_${file}}
+STAGE_DIR.${${_${group}DIR_${file}}:C,[/*],_,g}= ${STAGE_OBJTOP}${${_${group}DIR_${file}}}
stage_as.${${_${group}DIR_${file}}:C,[/*],_,g}: ${file}
installfiles-${group}: _${group}INS1_${file}
More information about the svn-src-head
mailing list