You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/04/09 20:21:13 UTC
svn commit: r1466169 - in /qpid/trunk/qpid/cpp/etc: CMakeLists.txt
qpidd-primary.in
Author: mcpierce
Date: Tue Apr 9 18:21:12 2013
New Revision: 1466169
URL: http://svn.apache.org/r1466169
Log:
QPID-4698: Missed two macros in qpidd-primary.in
Fixed them to properly set the paths.
Modified:
qpid/trunk/qpid/cpp/etc/CMakeLists.txt
qpid/trunk/qpid/cpp/etc/qpidd-primary.in
Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1466169&r1=1466168&r2=1466169&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Tue Apr 9 18:21:12 2013
@@ -17,6 +17,7 @@
# under the License.
#
+set (bindir ${QPID_INSTALL_BINDIR})
set (sysconfdir ${SYSCONF_INSTALL_DIR})
configure_file(qpidd-primary.in
Modified: qpid/trunk/qpid/cpp/etc/qpidd-primary.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd-primary.in?rev=1466169&r1=1466168&r2=1466169&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd-primary.in (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd-primary.in Tue Apr 9 18:21:12 2013
@@ -40,13 +40,13 @@ prog=qpidd
# Source function library.
. /etc/rc.d/init.d/functions
-if [ -f @sysconfdir@/sysconfig/$prog ] ; then
- . @sysconfdir@/sysconfig/$prog
+if [ -f /@sysconfdir@/sysconfig/$prog ] ; then
+ . /@sysconfdir@/sysconfig/$prog
fi
-# The following variables can be overridden in !!sysconfdir!!/sysconfig/$prog
+# The following variables can be overridden in @sysconfdir@/sysconfig/$prog
[[ $QPID_PORT ]] || QPID_PORT=5672
-[[ $QPID_HA ]] || QPID_HA=!!bindir!!/qpid-ha
+[[ $QPID_HA ]] || QPID_HA=/@bindir@/qpid-ha
export QPID_PORT
RETVAL=0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org