diff make/windows/projectfiles/common/Makefile @ 1978:2ca799d83d3c

Merge
author ohair
date Tue, 30 Nov 2010 18:10:20 -0800
parents f95d63e2154a c7db7adb83b4
children aa6e219afbf1
line wrap: on
line diff
--- a/make/windows/projectfiles/common/Makefile	Mon Nov 29 15:43:36 2010 -0500
+++ b/make/windows/projectfiles/common/Makefile	Tue Nov 30 18:10:20 2010 -0800
@@ -65,7 +65,11 @@
 !else
 HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
 !endif
+!if "$(USER_RELEASE_SUFFIX)" != ""
+HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
+!else
 HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
+!endif
 !if "$(HOTSPOT_BUILD_VERSION)" != ""
 HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
 !endif