diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2013-04-09 18:21:12 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2013-04-09 18:21:12 +0000 |
| commit | ba2b45010471e043c10434f14d5c824c6fd0c969 (patch) | |
| tree | 46a8939632b4ba7ee2d7ab96dd1b29ada96d530f | |
| parent | 46ba7bce8ef54d23de95ca67df14dfe27ffdf7a6 (diff) | |
| download | qpid-python-ba2b45010471e043c10434f14d5c824c6fd0c969.tar.gz | |
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
| -rw-r--r-- | qpid/cpp/etc/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | qpid/cpp/etc/qpidd-primary.in | 8 |
2 files changed, 5 insertions, 4 deletions
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 |