From 3ad963780505b0c6780ebae2f5b5130a0ece1c0d Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 9 May 2013 16:46:04 -0500
Subject: [PATCH] Issue #1927 - the rpm build will now correctly use the
 configurable uframe-eclipse location

Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: baa6b26c3470f21f8576aad59a4997599b9ee2e3 [formerly e9a9ed516bb3f1c9c2b4a768de07c46048de4077]
Former-commit-id: 58446575228426d72a077597bd17a4aba53f7cc8
---
 rpms/awips2.cave/setup/scripts/prepare_dist.sh        | 3 ++-
 rpms/awips2.core/Installer.common-base/component.spec | 3 ++-
 rpms/awips2.edex/deploy.builder/build.sh              | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rpms/awips2.cave/setup/scripts/prepare_dist.sh b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
index 6d031966e0..62c1143c5c 100644
--- a/rpms/awips2.cave/setup/scripts/prepare_dist.sh
+++ b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
@@ -73,7 +73,8 @@ fi
 time /awips2/ant/bin/ant -f p2-build.xml \
    -Declipse.dir=${UFRAME_ECLIPSE} \
    -Dbuild.version=${AWIPSII_VERSION} \
-   -Dbuild.arch=${CAVE_BUILD_ARCH}
+   -Dbuild.arch=${CAVE_BUILD_ARCH} \
+   -Declipse.dir=${UFRAME_ECLIPSE}
 RC=$?
 
 if [ ${RC} -ne 0 ]; then
diff --git a/rpms/awips2.core/Installer.common-base/component.spec b/rpms/awips2.core/Installer.common-base/component.spec
index 2a41c9f123..31dfbc5003 100644
--- a/rpms/awips2.core/Installer.common-base/component.spec
+++ b/rpms/awips2.core/Installer.common-base/component.spec
@@ -57,7 +57,8 @@ fi
 
 cd ${BUILD_EDEX}
 /awips2/ant/bin/ant -f ${_build_xml} \
-   -Dbuild.arch=${_pde_build_arch} ${_hybrid_target}
+   -Dbuild.arch=${_pde_build_arch} \
+   -Duframe.eclipse=%{_uframe_eclipse} ${_hybrid_target}
 if [ $? -ne 0 ]; then
    exit 1
 fi
diff --git a/rpms/awips2.edex/deploy.builder/build.sh b/rpms/awips2.edex/deploy.builder/build.sh
index f10f4cb261..68f79ecd5b 100644
--- a/rpms/awips2.edex/deploy.builder/build.sh
+++ b/rpms/awips2.edex/deploy.builder/build.sh
@@ -136,10 +136,12 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 if [ ${LIGHTNING} = true ]; then
-   /awips2/ant/bin/ant -f build.xml -Dlightning=true
+   /awips2/ant/bin/ant -f build.xml -Dlightning=true \
+      -Duframe.eclipse=${UFRAME_ECLIPSE}
    RC=$?
 else
-   /awips2/ant/bin/ant -f build.xml
+   /awips2/ant/bin/ant -f build.xml \
+      -Duframe.eclipse=${UFRAME_ECLIPSE}
    RC=$?
 fi
 if [ ${RC} -ne 0 ]; then