Merge "Issue #1537 - fixed the edex-environment build" into development

Former-commit-id: 36272799c6 [formerly aa7edb8004479dd71fb3863392ec78eb6830e657]
Former-commit-id: b5b1ea923a
This commit is contained in:
Richard Peter 2013-01-29 10:34:20 -06:00 committed by Gerrit Code Review
commit fa22dd1557

View file

@ -112,10 +112,11 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
_QPID_VERSION="0.7"
RPM_PROJECT="%{_baseline_workspace}/rpms" RPM_PROJECT="%{_baseline_workspace}/rpms"
POSTGRES_INITD="${RPM_PROJECT}/awips2.core/Installer.postgresql/scripts/init.d/edex_postgres" POSTGRES_INITD="${RPM_PROJECT}/awips2.core/Installer.postgresql/scripts/init.d/edex_postgres"
QPID_INITD="${RPM_PROJECT}/awips2.qpid/SOURCES/qpidd" QPID_INITD="${RPM_PROJECT}/awips2.qpid/${_QPID_VERSION}/SOURCES/qpidd"
QUEUE_SH="${RPM_PROJECT}/awips2.qpid/SOURCES/queueCreator.sh" QUEUE_SH="${RPM_PROJECT}/awips2.qpid/${_QPID_VERSION}/SOURCES/queueCreator.sh"
EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel" EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel"
HTTPD_PYPIES_INITD="${RPM_PROJECT}/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies" HTTPD_PYPIES_INITD="${RPM_PROJECT}/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies"