From ba2b45010471e043c10434f14d5c824c6fd0c969 Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" Date: Tue, 9 Apr 2013 18:21:12 +0000 Subject: QPID-4698: Missed two macros in qpidd-primary.in Fixed them to properly set the paths. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1466169 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/CMakeLists.txt | 1 + qpid/cpp/etc/qpidd-primary.in | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt index bca343fbf9..5bea1351e2 100644 --- a/qpid/cpp/etc/CMakeLists.txt +++ b/qpid/cpp/etc/CMakeLists.txt @@ -17,6 +17,7 @@ # under the License. # +set (bindir ${QPID_INSTALL_BINDIR}) set (sysconfdir ${SYSCONF_INSTALL_DIR}) configure_file(qpidd-primary.in diff --git a/qpid/cpp/etc/qpidd-primary.in b/qpid/cpp/etc/qpidd-primary.in index fb888227cf..3088a643f2 100755 --- a/qpid/cpp/etc/qpidd-primary.in +++ b/qpid/cpp/etc/qpidd-primary.in @@ -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 -- cgit v1.2.1