commit e6e61634cd4409156fa52581afcb9cf6f18d2d5e
author Chirayu Desai <cdesai@cyanogenmod.org> Tue Dec 04 19:16:48 2012 +0530
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Wed Dec 05 23:36:19 2012 -0800
tree 285d0bb4e0a7679d31fbabfb26e521876d98df5b
parent da95d9f44e10d6c8f0539dbb4958570a81c71316

cm: include minor version in CM_VERSION if not 0

Change-Id: I0b7d0227bcb0fc5de831bcb065e087afece89a34

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 1c4cce9..7689760 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -210,7 +210,11 @@
 ifdef CM_RELEASE
     CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
 else
-    CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    ifeq ($(PRODUCT_VERSION_MINOR),0)
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    else
+        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
+    endif
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \