Mailinglist Archive: zypp-commit (301 mails)

< Previous Next >
[zypp-commit] r7482 - /trunk/zypper/CMakeLists.txt
  • From: dmacvicar@xxxxxxxxxxxxxxxx
  • Date: Thu, 11 Oct 2007 12:56:27 -0000
  • Message-id: <20071011125627.E0A7B44A67@xxxxxxxxxxxxxxxx>
Author: dmacvicar
Date: Thu Oct 11 14:56:27 2007
New Revision: 7482

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7482&view=rev
Log:
use sane defaults for those alien parameters so we dont force the developer
to specify them

Modified:
    trunk/zypper/CMakeLists.txt

Modified: trunk/zypper/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/CMakeLists.txt?rev=7482&r1=7481&r2=7482&view=diff
==============================================================================
--- trunk/zypper/CMakeLists.txt (original)
+++ trunk/zypper/CMakeLists.txt Thu Oct 11 14:56:27 2007
@@ -20,8 +20,14 @@
 # system configuration dir (etc)
 
 IF( NOT DEFINED SYSCONFDIR )
-  SET( SYSCONFDIR /etc )
+  IF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
+    # if installing in usr, set sysconfg to etc
+    SET( SYSCONFDIR /etc )
+  ELSE ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
+    SET ( SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" )
+  ENDIF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
 ENDIF( NOT DEFINED SYSCONFDIR )
+MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" )
 
 # system configuration dir (etc)
 

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages