commit d8e7666540ca57942ab6f2f585172561dc9500a0
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Fri Jun 08 11:08:15 2012 +0100
committer Ricardo Cerqueira <cyanogenmod@cerqueira.org> Fri Jun 08 11:08:15 2012 +0100
tree b992f8af1ffca0b12fb49f03f3bbb2566dc54e97
parent 2128e2f956ecc77c7e3699773efc5a0cbf756920

Reset tags for UNOFFICIAL builds

Don't force a buildtype unless one is actually set. Anything without
a type is UNOFFICIAL

Change-Id: I38742485e580e21c51ee5e3f10467e7afbf247d9

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 52e9086..6b3e317 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -131,16 +131,17 @@
     CM_BUILDTYPE := RELEASE
 endif
 
-ifdef CM_EXTRAVERSION
-    # Force build type to EXPERIMENTAL
-    CM_BUILDTYPE := EXPERIMENTAL
-    # Add leading dash to CM_EXTRAVERSION
-    CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
-endif
-
-# If CM_BUILDTYPE is not defined, set to UNOFFICIAL
-ifndef CM_BUILDTYPE
+ifdef CM_BUILDTYPE
+    ifdef CM_EXTRAVERSION
+        # Force build type to EXPERIMENTAL
+        CM_BUILDTYPE := EXPERIMENTAL
+        # Add leading dash to CM_EXTRAVERSION
+        CM_EXTRAVERSION := -$(CM_EXTRAVERSION)
+    endif
+else
+    # If CM_BUILDTYPE is not defined, set to UNOFFICIAL
     CM_BUILDTYPE := UNOFFICIAL
+    CM_EXTRAVERSION :=
 endif
 
 ifdef CM_RELEASE