Author: sjg
Date: Tue Oct 8 20:14:33 2019
New Revision: 353322
URL: https://svnweb.freebsd.org/changeset/base/353322
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
MFC of r352942
Reviewed by: stevek
Differential Revision: https://reviews.freebsd.org/D21858
Modified:
stable/12/share/mk/bsd.files.mk
Modified: stable/12/share/mk/bsd.files.mk
==============================================================================
--- stable/12/share/mk/bsd.files.mk Tue Oct 8 19:49:25 2019
(r353321)
+++ stable/12/share/mk/bsd.files.mk Tue Oct 8 20:14:33 2019
(r353322)
@@ -105,7 +105,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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
