commit dd55974cfef0fbb995fc5c8e6e5c9a57e3420102
author Trevor Gill <trevorjgill@gmail.com> Mon May 21 20:13:17 2012 -0400
committer Steve Kondik <shade@chemlab.org> Mon May 28 05:33:33 2012 -0700
tree f10968dd57830a565d6aeabe54ef2de529823c53
parent 4fda87afffe96e7e6308e00c38bcecec2bc95dd1

Added a '-' so that CM_EXTRAVERSION isn't squished into the device name

Patch 2: Fixed the possibility of no CM_EXTRAVERSION resulting in 2 '-' at the end of the file name.

Change-Id: I3025977a5da1e28247c74416e1ac50fc6901eb23

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 39e773e..d183a85 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -124,6 +124,9 @@
     CM_VERSION :=$(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-NIGHTLY-$(CM_BUILD)
 else
     ifdef CM_SNAPSHOT
+        ifdef CM_EXTRAVERSION
+            CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
+        endif
         CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date +%Y%m%d)-SNAPSHOT-$(CM_BUILD)$(CM_EXTRAVERSION)
     else
         ifdef CM_RELEASE