summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorDarryl L. Pierce <mcpierce@apache.org>2013-05-24 14:58:37 +0000
committerDarryl L. Pierce <mcpierce@apache.org>2013-05-24 14:58:37 +0000
commit98b5444ae08b7a022403d7e6cd16f3ebead4b1a5 (patch)
tree829bc4ffb67a44327440831692864bf50e75b6e4 /cpp
parent689ff4b0ac1cca1b1d913b1dbc9e9e49333db593 (diff)
downloadqpid-python-98b5444ae08b7a022403d7e6cd16f3ebead4b1a5.tar.gz
QPID-4885: C++ examples install to qpid/examples
Previously they installed to /usr/local/share/examples. This changes that to /usr/local/share/qpid/examples instead. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1486084 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/BuildInstallSettings.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake
index d63a61e512..8146c3b994 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/cpp/BuildInstallSettings.cmake
@@ -93,7 +93,7 @@ if (WIN32)
"Directory to install SASL configuration files")
set (QPID_INSTALL_DATADIR conf CACHE STRING
"Directory to install read-only arch.-independent data root")
- set (QPID_INSTALL_EXAMPLESDIR examples CACHE STRING
+ set (QPID_INSTALL_EXAMPLESDIR qpid/examples CACHE STRING
"Directory to install programming examples in")
set (QPID_INSTALL_DOCDIR docs CACHE STRING
"Directory to install documentation")
@@ -174,7 +174,7 @@ if (UNIX)
set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR})
set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2)
set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid)
- set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/examples)
+ set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/qpid/examples)
set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install documentation
set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR})
set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR})