Page MenuHomeFreeBSD
Files F107621493

D18847.diff
No OneTemporary
Actions

D18847.diff
View Options

Index: head/share/mk/bsd.confs.mk
===================================================================
--- head/share/mk/bsd.confs.mk
+++ head/share/mk/bsd.confs.mk
@@ -40,7 +40,6 @@
${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 @@
_${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 @@
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}
Index: head/share/mk/bsd.files.mk
===================================================================
--- head/share/mk/bsd.files.mk
+++ head/share/mk/bsd.files.mk
@@ -37,7 +37,6 @@
${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 @@
_${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 @@
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}

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 17, 7:09 PM (21 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15842282
Default Alt Text
D18847.diff (1 KB)

Event Timeline