Page MenuHomeFreeBSD
Files F102971553

D27611.diff
No OneTemporary
Actions

D27611.diff
View Options

diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -8,13 +8,6 @@
INCSGROUPS?= INCS
-.if defined(NO_ROOT)
-.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+= package=${PACKAGE:Uutilities}
-.endif
-TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
-.endif
-
.if !target(buildincludes)
.for group in ${INCSGROUPS}
buildincludes: ${${group}}
@@ -37,6 +30,17 @@
STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
STAGE_SYMLINKS_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}
+.if defined(NO_ROOT)
+.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
+.if defined(${group}PACKAGE)
+${group}TAGS+= package=${${group}PACKAGE:Uutilities},dev
+.else
+${group}TAGS+= package=${PACKAGE:Uutilities},dev
+.endif
+.endif
+${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
+.endif
+
_${group}INCS=
.for header in ${${group}}
.if defined(${group}OWN_${header:T}) || defined(${group}GRP_${header:T}) || \
@@ -67,7 +71,7 @@
.else
_${group}INCS+= ${header}
.endif
-.endfor
+.endfor # header in ${${group}}
.if !empty(_${group}INCS)
stage_files.${group}: ${_${group}INCS}
stage_includes: stage_files.${group}
@@ -75,16 +79,16 @@
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
.else
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/
.endif
-.endif
+.endif # !empty(_${group}INCS)
.endif # defined(${group}) && !empty(${group})
-.endfor
+.endfor # group in ${INCSGROUPS}
.if defined(INCSLINKS) && !empty(INCSLINKS)
installincludes:

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 8:32 AM (21 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14734082
Default Alt Text
D27611.diff (1 KB)

Event Timeline