Permalink
Browse files

changed VERSION to EUCA_VERSION

  • Loading branch information...
1 parent bc054d2 commit 015eb7cc63d581443f7a6bc3a0065ee1eb891b8e graziano committed Aug 19, 2009
Showing with 10 additions and 12 deletions.
  1. +1 −3 Makedefs.in
  2. +3 −3 configure
  3. +3 −3 configure.ac
  4. +2 −2 tools/eucalyptus-java-ws.in
  5. +1 −1 util/eucalyptus-config.h.in
View
@@ -4,7 +4,7 @@
#
# which version
-export VERSION = @VERSION@
+export VERSION = @EUCA_VERSION@
# packages we depend upon
export AXIS2C_HOME = @AXIS2C_HOME@
@@ -33,8 +33,6 @@ datarootdir = ${usrdir}/share
# where we are going to install eucalyptus, and Co.
export EUCALYPTUS = ${prefix}
TOP = @TOP@
-DIST_DIR = eucalyptus-$(VERSION)
-DIST_ROOT = $(TOP)/$(DIST_DIR)
# system dependents
CC = @CC@
View
@@ -603,7 +603,7 @@ AXIS2C_HOME
JAVA_HOME
WSDL2C
TOP
-VERSION
+EUCA_VERSION
LIBOBJS
JAVA
ANT
@@ -3432,7 +3432,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
$as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-VERSION="`cat VERSION`"
+EUCA_VERSION="`cat VERSION`"
# let's figure out where is the source tree
if test ${srcdir} = "." ; then
@@ -6994,7 +6994,7 @@ ac_config_files="$ac_config_files Makedefs tools/eucalyptus-cc:tools/eucalyptus-
cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
+#define EUCA_VERSION "$EUCA_VERSION"
_ACEOF
View
@@ -16,7 +16,7 @@ AC_CONFIG_SRCDIR([wsdl/eucalyptus_nc.wsdl])
AC_CONFIG_HEADER([util/eucalyptus-config.h])
AC_PREFIX_DEFAULT([/opt/eucalyptus/])
AC_USE_SYSTEM_EXTENSIONS
-VERSION="`cat VERSION`"
+EUCA_VERSION="`cat VERSION`"
# let's figure out where is the source tree
if test ${srcdir} = "." ; then
@@ -214,9 +214,9 @@ AC_CONFIG_FILES([Makedefs
tools/euca_conf:tools/euca_conf.in
tools/eucalyptus-java-ws:tools/eucalyptus-java-ws.in])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED(EUCA_VERSION, "$EUCA_VERSION")
-AC_SUBST(VERSION)
+AC_SUBST(EUCA_VERSION)
AC_SUBST(TOP)
AC_SUBST(ANT)
AC_SUBST(WSDL2C)
@@ -26,8 +26,8 @@ ANT="`which ant 2> /dev/null`"
JAVA="`which java 2> /dev/null`"
EUCA_USER="eucalyptus"
-JAR_NAME="/usr/share/eucalyptus/eucalyptus-JARNAME-@VERSION@.jar"
-JAR_ALL_NAMES="/usr/share/eucalyptus/eucalyptus-interface-@VERSION@.jar /usr/share/eucalyptus/eucalyptus-storagecontroller-@VERSION@.jar /usr/share/eucalyptus/eucalyptus-storagemgr-@VERSION@.jar"
+JAR_NAME="/usr/share/eucalyptus/eucalyptus-JARNAME-@EUCA_VERSION@.jar"
+JAR_ALL_NAMES="/usr/share/eucalyptus/eucalyptus-interface-@EUCA_VERSION@.jar /usr/share/eucalyptus/eucalyptus-storagecontroller-@EUCA_VERSION@.jar /usr/share/eucalyptus/eucalyptus-storagemgr-@EUCA_VERSION@.jar"
if [ "$EUID" != "0" ]; then
echo "Eucalyptus init scripts must be run as root."
@@ -6,7 +6,7 @@
#endif
/* Current version */
-#undef VERSION
+#undef EUCA_VERSION
/* headers on the system */

0 comments on commit 015eb7c

Please sign in to comment.