diff -r 3f1ef7f899ea -r 1c130e7b7a2e make/common/shared/Defs.gmk --- a/make/common/shared/Defs.gmk Tue Sep 01 23:44:41 2009 +0100 +++ b/make/common/shared/Defs.gmk Wed Sep 02 09:20:17 2009 -0700 @@ -228,12 +228,15 @@ endif # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set -ifdef BUILD_NUMBER - FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) -else - BUILD_NUMBER = b00 - USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) - FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) +ifndef FULL_VERSION + ifdef BUILD_NUMBER + FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER) + else + BUILD_NUMBER = b00 + USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`) + FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER) + endif + export FULL_VERSION endif # Promoted build location