summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-06-08 11:08:15 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-06-08 11:08:15 +0100
commitd8e7666540ca57942ab6f2f585172561dc9500a0 (patch)
treeb992f8af1ffca0b12fb49f03f3bbb2566dc54e97
parent2128e2f956ecc77c7e3699773efc5a0cbf756920 (diff)
downloadvendor_replicant-d8e7666540ca57942ab6f2f585172561dc9500a0.zip
vendor_replicant-d8e7666540ca57942ab6f2f585172561dc9500a0.tar.gz
vendor_replicant-d8e7666540ca57942ab6f2f585172561dc9500a0.tar.bz2
Reset tags for UNOFFICIAL builds
Don't force a buildtype unless one is actually set. Anything without a type is UNOFFICIAL Change-Id: I38742485e580e21c51ee5e3f10467e7afbf247d9
-rw-r--r--config/common.mk19
1 files changed, 10 insertions, 9 deletions
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 @@ 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