qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r881172 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake CMakeLists.txt
Date Tue, 17 Nov 2009 06:42:53 GMT
Author: astitcher
Date: Tue Nov 17 06:42:52 2009
New Revision: 881172

URL: http://svn.apache.org/viewvc?rev=881172&view=rev
Log:
Make the unix config files install in the install prefix not absolute /etc

Modified:
    qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
    qpid/trunk/qpid/cpp/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=881172&r1=881171&r2=881172&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Tue Nov 17 06:42:52 2009
@@ -109,10 +109,9 @@
   set (CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME
        "Items required to build new C++ Qpid client programs")
 
-
   set (QPID_INSTALL_BINDIR bin CACHE STRING
        "Directory to install user executables")
-  set (QPID_INSTALL_CONFDIR /etc/qpid CACHE STRING
+  set (QPID_INSTALL_CONFDIR etc/qpid CACHE STRING
        "Directory to install configuration files")
   set (QPID_INSTALL_DATADIR share/qpid CACHE STRING
        "Directory to install read-only arch.-independent data root")

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=881172&r1=881171&r2=881172&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Tue Nov 17 06:42:52 2009
@@ -67,13 +67,6 @@
 
 endif (WIN32)
 
-if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-  # Set up install locations. Since the Linux install puts some files in
-  # /etc and most in the install location, we need to use a DESTDIR build
-  # rather than the usual simple use of CPACK_INSTALL_PREFIX.
-  set (CPACK_SET_DESTDIR ON)
-endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
-
 set (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf CACHE STRING
      "Name of the Qpid client configuration file")
 set (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf CACHE STRING



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message