From d8e7666540ca57942ab6f2f585172561dc9500a0 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Fri, 8 Jun 2012 11:08:15 +0100
Subject: [PATCH] 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 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index 52e90867..6b3e3179 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -131,16 +131,17 @@ ifdef CM_RELEASE
     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