pkgbase: use -dev,-dbg instead of -development,-debug
-development is long and awkward, and is also inconsistent with prior art from the Linux world, which uses -dev (Debian) or -devel (Red Hat). Follow the Debian convention, and similarly for debug info packages. Also remove redundant pkgbase development tag from includes. We already tag include files with package=runtime,dev; there is no need to separately tag them as dev. Discussed with: bapt Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24139
This commit is contained in:
@@ -60,7 +60,7 @@ stage_includes: stage_as.${header:T}
|
||||
|
||||
installincludes: _${group}INS_${header:T}
|
||||
_${group}INS_${header:T}: ${header}
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
||||
${.ALLSRC} \
|
||||
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
|
||||
@@ -75,10 +75,10 @@ stage_includes: stage_files.${group}
|
||||
installincludes: _${group}INS
|
||||
_${group}INS: ${_${group}INCS}
|
||||
.if defined(${group}NAME)
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
|
||||
.else
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}/
|
||||
.endif
|
||||
.endif
|
||||
@@ -89,7 +89,7 @@ _${group}INS: ${_${group}INCS}
|
||||
.if defined(INCSLINKS) && !empty(INCSLINKS)
|
||||
installincludes:
|
||||
.for s t in ${INCSLINKS}
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${s} ${DESTDIR}${t}
|
||||
${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ${s} ${DESTDIR}${t}
|
||||
.endfor
|
||||
.endif
|
||||
.endif # !target(installincludes)
|
||||
|
||||
Reference in New Issue
Block a user