summaryrefslogtreecommitdiff
path: root/qpid/extras/dispatch
diff options
context:
space:
mode:
authorDarryl L. Pierce <mcpierce@apache.org>2013-09-27 18:26:54 +0000
committerDarryl L. Pierce <mcpierce@apache.org>2013-09-27 18:26:54 +0000
commit560f1c7df19ded133a35287f99a23c9933a0e6f7 (patch)
treeeb23d709b0e8b734ee49a42a2f72b0b59d13d318 /qpid/extras/dispatch
parent4393788670d88b84a3ef8354626c83d04c4c057b (diff)
downloadqpid-python-560f1c7df19ded133a35287f99a23c9933a0e6f7.tar.gz
QPID-5185: Install qpid-dispatch.conf to /etc/qpid
Now the file is installed to the same location as other Qpid configuration files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527019 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/extras/dispatch')
-rw-r--r--qpid/extras/dispatch/CMakeLists.txt2
-rw-r--r--qpid/extras/dispatch/ChangeLog1
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/extras/dispatch/CMakeLists.txt b/qpid/extras/dispatch/CMakeLists.txt
index 7449e738e7..3ef9c38261 100644
--- a/qpid/extras/dispatch/CMakeLists.txt
+++ b/qpid/extras/dispatch/CMakeLists.txt
@@ -118,7 +118,7 @@ install(TARGETS qpid-dispatch
file(GLOB headers "include/qpid/dispatch/*.h")
install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/qpid/dispatch)
install(FILES include/qpid/dispatch.h DESTINATION ${INCLUDE_INSTALL_DIR}/qpid)
-install(FILES etc/qpid-dispatch.conf DESTINATION ${SYSCONF_INSTALL_DIR})
+install(FILES etc/qpid-dispatch.conf DESTINATION ${SYSCONF_INSTALL_DIR}/qpid)
##
## Python modules installation
diff --git a/qpid/extras/dispatch/ChangeLog b/qpid/extras/dispatch/ChangeLog
index 36c50ce3ec..83b9c4891e 100644
--- a/qpid/extras/dispatch/ChangeLog
+++ b/qpid/extras/dispatch/ChangeLog
@@ -1,3 +1,4 @@
Version 0.1:
* Initial development work.
* QPID-5186: Install documentation files.
+ * QPID-5185: Install qpid-dispatch.conf to /etc/qpid