From 897c2ffea68e01d08701461ee6919f33c5589921 Mon Sep 17 00:00:00 2001
From: decker <decker@personal-army>
Date: Fri, 1 May 2009 02:08:05 -0700
Subject: [PATCH 1/2] removed setting EUCALYTPUS from @prefix@, this breaks deb
 builds

---
 tools/eucalyptus-cc.in    | 3 ++-
 tools/eucalyptus-cloud.in | 3 ++-
 tools/eucalyptus-nc.in    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/eucalyptus-cc.in b/tools/eucalyptus-cc.in
index b7973a0f0c3..18224ee7e77 100755
--- a/tools/eucalyptus-cc.in
+++ b/tools/eucalyptus-cc.in
@@ -45,7 +45,8 @@ NAME=eucalyptus-cc
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+#       EUCALYPTUS="@prefix@" this breaks builds into a chroot
+        EUCALYPTUS="/"
 fi
 export EUCALYPTUS
 
diff --git a/tools/eucalyptus-cloud.in b/tools/eucalyptus-cloud.in
index 44704391733..530de128bf1 100755
--- a/tools/eucalyptus-cloud.in
+++ b/tools/eucalyptus-cloud.in
@@ -52,7 +52,8 @@ JAVA="`which java 2> /dev/null`"
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+#       EUCALYPTUS="@prefix@" this breaks builds into a chroot
+        EUCALYPTUS="/"
 fi
 export EUCALYPTUS
 
diff --git a/tools/eucalyptus-nc.in b/tools/eucalyptus-nc.in
index 0619f20fdf5..efb08c5fb05 100755
--- a/tools/eucalyptus-nc.in
+++ b/tools/eucalyptus-nc.in
@@ -47,7 +47,8 @@ MODPROBE="`which modprobe 2> /dev/null`"
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+#	EUCALYPTUS="@prefix@" this breaks builds into a chroot
+        EUCALYPTUS="/"
 fi
 export EUCALYPTUS
 

From 960af11f5d299b95f0e711cf61396f32f4fd8d3c Mon Sep 17 00:00:00 2001
From: decker <decker@personal-army>
Date: Fri, 1 May 2009 02:16:03 -0700
Subject: [PATCH 2/2] set AXIS2C_HOME explicitly in the eucalyptus.conf.debian
 file

---
 tools/eucalyptus.conf.debian | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/eucalyptus.conf.debian b/tools/eucalyptus.conf.debian
index 0cca833492d..d5d38bc3373 100644
--- a/tools/eucalyptus.conf.debian
+++ b/tools/eucalyptus.conf.debian
@@ -8,7 +8,7 @@
 
 # This variable point to where eucalyptus has been installed.
 EUCALYPTUS="/"
-
+AXIS2C_HOME=/usr/lib/axis2
 # This is the username that you require eucalyptus to run as
 EUCA_USER="eucalyptus"