summaryrefslogtreecommitdiff
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
commite7deef3cb2f767b2c292245313c04e5bd99ff0ee (patch)
tree25bf68c234b41f76538d00f534be317dd369cf20
parentd8693c208de705b155831287c4d1ba84ef6f0778 (diff)
downloadqpid-python-e7deef3cb2f767b2c292245313c04e5bd99ff0ee.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/qpid@1527019 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--extras/dispatch/CMakeLists.txt2
-rw-r--r--extras/dispatch/ChangeLog1
2 files changed, 2 insertions, 1 deletions
diff --git a/extras/dispatch/CMakeLists.txt b/extras/dispatch/CMakeLists.txt
index 7449e738e7..3ef9c38261 100644
--- a/extras/dispatch/CMakeLists.txt
+++ b/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/extras/dispatch/ChangeLog b/extras/dispatch/ChangeLog
index 36c50ce3ec..83b9c4891e 100644
--- a/extras/dispatch/ChangeLog
+++ b/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