svn commit: r343067 - head/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Tue Jan 15 23:37:49 2019
New Revision: 343067
URL: https://svnweb.freebsd.org/changeset/base/343067

Log:
  Fix STAGE_DIR.* to handle indirect *DIR variables.
  
  bsd.{files,conf}.mk recently changed to allow *DIR to name a variable
  rather than a path.
  STAGE_DIR.* need to adapt.
  
  Reviewed by:  bdrewery
  Differential Revision:        D18847

Modified:
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.files.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk  Tue Jan 15 23:35:53 2019        (r343066)
+++ head/share/mk/bsd.confs.mk  Tue Jan 15 23:37:49 2019        (r343067)
@@ -40,7 +40,6 @@ ${group}GRP?= ${SHAREGRP}
 ${group}MODE?= ${CONFMODE}
 ${group}DIR?=  ${CONFDIR}
 STAGE_SETS+=   ${group:C,[/*],_,g}
-STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
 
 .      if defined(NO_ROOT)
 .        if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
@@ -65,6 +64,7 @@ DIRS+=        ${group}DIR
 _${group}DIR=  ${group}DIR
 .      endif
 
+STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${_${group}DIR}}
 
 .      for cnf in ${${group}}
 ${group}OWN_${cnf}?=   ${${group}OWN}
@@ -119,7 +119,7 @@ INSTALL_COPY=  -C
 STAGE_AS_SETS+= ${cnf:T}
 STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
 # XXX {group}OWN,GRP,MODE
-STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
+STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${_${group}DIR_${cnf}}}
 stage_as.${cnf:T}: ${cnf}
 
 realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T}

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk  Tue Jan 15 23:35:53 2019        (r343066)
+++ head/share/mk/bsd.files.mk  Tue Jan 15 23:37:49 2019        (r343067)
@@ -37,7 +37,6 @@ ${group}GRP=  ${SHAREGRP}
 ${group}MODE?= ${SHAREMODE}
 ${group}DIR?=  BINDIR
 STAGE_SETS+=   ${group:C,[/*],_,g}
-STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
 
 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
@@ -57,6 +56,7 @@ DIRS+=        ${group}DIR
 _${group}DIR=  ${group}DIR
 .endif
 
+STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${_${group}DIR}}
 
 .for file in ${${group}}
 ${group}OWN_${file}?=  ${${group}OWN}
@@ -100,7 +100,7 @@ ${group}NAME_${file}?=      ${file:T}
 STAGE_AS_SETS+=        ${file}
 STAGE_AS_${file}= ${${group}NAME_${file}}
 # XXX {group}OWN,GRP,MODE
-STAGE_DIR.${file}= ${STAGE_OBJTOP}${${group}DIR_${file}}
+STAGE_DIR.${file}= ${STAGE_OBJTOP}${${_${group}DIR_${file}}}
 stage_as.${file}: ${file}
 
 installfiles-${group}: _${group}INS1_${file}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"