[Gemrb-commits] gemrb: branch master updated. b9b518deb8ec9731a766a666086680c7d82b097b

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b9b518deb8ec9731a766a666086680c7d82b097b (commit)

Summary of changes:
 CMakeLists.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
      from  6671e3fc94f839cc0727a65c5e4136b2b6e9ad84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b9b518deb8ec9731a766a666086680c7d82b097b

commit b9b518deb8ec9731a766a666086680c7d82b097b
Author: Tom Prince <tom...@ua...>
Date:   Wed Jun 16 09:56:12 2010 -0400

    cmake: Use SYSCONF_DIR=/etc for fhs build into /usr.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cbbfb..a21dd0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,11 @@ elseif (${LAYOUT} MATCHES "fhs")
 		SET( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
 	ENDIF( NOT BIN_DIR )
 	IF( NOT SYSCONF_DIR )
-		SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
+		if ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
+			SET( SYSCONF_DIR /etc/gemrb )
+		else ()
+			SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
+		endif ()
 	ENDIF( NOT SYSCONF_DIR )
 	IF( NOT ICON_DIR )
 		SET( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator