Move defaults for environment variables PRODUCT_VERSION, PRODUCT_BRAND, BUILD_NUMBER...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/Makefile b/Makefile
index d4cbefdf7c87fa57b89623065c1b4d77d8a8edc2..c55cf098d084893a2ce105ce6462841ceaef56c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,6 @@
-# Set this to some other value on systems with no Xen libs to
-# build only the client stuff and the fakeserver.
-COMPILE_XENSTUFF=yes
-export COMPILE_XENSTUFF
-
-PRODUCT_VERSION?=unknown
-PRODUCT_BRAND?=Rio
-BUILD_NUMBER?=6666
 COMPILE_NATIVE=yes
 COMPILE_BYTE=no # bytecode version does not build
-export PRODUCT_VERSION PRODUCT_BRAND BUILD_NUMBER COMPILE_NATIVE COMPILE_BYTE
+export COMPILE_NATIVE COMPILE_BYTE
 
 .PHONY: all
 all: version

diff --git a/OMakefile b/OMakefile
index f8c17ec50dd06e0a5cbe931082bf53873664a0ac..b0dfba0e2100ad5ec902953bc7d9c54c1e0d50a2 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -66,6 +66,10 @@ export CLEAN_OBJS
 COMPILE_OCAML=$(getenv COMPILE_OCAML, yes)
 COMPILE_JS=$(getenv COMPILE_JS, yes)
 COMPILE_JAVA=$(getenv COMPILE_JAVA, yes)
+
+PRODUCT_VERSION=$(getenv PRODUCT_VERSION, unknown)
+PRODUCT_BRAND=$(getenv PRODUCT_BRAND, unknown)
+BUILD_NUMBER=$(getenv BUILD_NUMBER, -1)
 export
 
 .SUBDIRS: ocaml scripts $(if $(COMPILE_JAVA), java) $(if $(COMPILE_JS), javascript)