Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 18381 invoked from network); 17 Nov 2009 06:43:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Nov 2009 06:43:16 -0000 Received: (qmail 16837 invoked by uid 500); 17 Nov 2009 06:43:16 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 16794 invoked by uid 500); 17 Nov 2009 06:43:16 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 16785 invoked by uid 99); 17 Nov 2009 06:43:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 06:43:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 06:43:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D80F2388904; Tue, 17 Nov 2009 06:42:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881172 - in /qpid/trunk/qpid/cpp: BuildInstallSettings.cmake CMakeLists.txt Date: Tue, 17 Nov 2009 06:42:53 -0000 To: commits@qpid.apache.org From: astitcher@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091117064253.1D80F2388904@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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