diff options
Diffstat (limited to 'cpp/etc')
| -rw-r--r-- | cpp/etc/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | cpp/etc/qpidd-primary.in | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/etc/CMakeLists.txt b/cpp/etc/CMakeLists.txt index bca343fbf9..5bea1351e2 100644 --- a/cpp/etc/CMakeLists.txt +++ b/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/cpp/etc/qpidd-primary.in b/cpp/etc/qpidd-primary.in index fb888227cf..3088a643f2 100755 --- a/cpp/etc/qpidd-primary.in +++ b/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 |