aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-10-26 01:41:54 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-10-26 01:41:54 +0000
commit69c7d069afdebf92900ba6966504441e260e2e96 (patch)
tree148b64508ebe8cfde60da952d9699697e1ea46e1 /release/Makefile
parent3f6732e8e0ee171935ed69b3954e545be9869bf7 (diff)
Notes
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index 1bba6f1c785eb..fe401f3b55f54 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -56,13 +56,17 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
.for _V in ${TARGET_ARCH}
.if !empty(TARGET:M${_V})
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
+VOLUME_LABEL= ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
.else
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
+VOLUME_LABEL= ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
.endif
.endfor
.endif
-VOLUME_LABEL= ${OSRELEASE:C/[-\.]/_/g:S/^$${TYPE}_//}
+.if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
+VOLUME_LABEL= FreeBSD_Install
+.endif
.if !exists(${DOCDIR})
NODOC= true