[Gemrb-commits] gemrb: branch master updated. 39734e13ab523fb298493be2377ec77960e0bdc3

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  39734e13ab523fb298493be2377ec77960e0bdc3 (commit)

Summary of changes:
 gemrb/CMakeLists.txt                            |    9 ++++++++-
 gemrb/{GemRB.cfg.sample => GemRB.cfg.sample.in} |    8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename gemrb/{GemRB.cfg.sample => GemRB.cfg.sample.in} (99%)
      from  7d292e7f18c368f0e2c8d9970630241d17b40e74 (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=39734e13ab523fb298493be2377ec77960e0bdc3

commit 39734e13ab523fb298493be2377ec77960e0bdc3
Author: Jaka Kranjc <lyn...@us...>
Date:   Mon Aug 16 19:38:50 2010 +0200

    cmake: predefine a few of the paths in the sample config based on user choice
    use git log -p -M for easier review

diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index abdb936..7be2bc8 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -22,5 +22,12 @@ ELSE(WIN32)
  ENDIF(APPLE)
 ENDIF(WIN32)
 
+# preconfigure the sample config with the selected paths
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/GemRB.cfg.sample.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/GemRB.cfg.sample"
+  IMMEDIATE @ONLY
+)
+
 INSTALL( TARGETS gemrb DESTINATION ${BIN_DIR} )
-INSTALL( FILES GemRB.cfg.sample GemRB.cfg.noinstall.sample DESTINATION ${SYSCONF_DIR} )
+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/GemRB.cfg.sample" GemRB.cfg.noinstall.sample DESTINATION ${SYSCONF_DIR} )
diff --git a/gemrb/GemRB.cfg.sample b/gemrb/GemRB.cfg.sample.in
similarity index 99%
rename from gemrb/GemRB.cfg.sample
rename to gemrb/GemRB.cfg.sample.in
index b038dcb..9544e1e 100644
--- a/gemrb/GemRB.cfg.sample
+++ b/gemrb/GemRB.cfg.sample.in
@@ -194,7 +194,7 @@ CachePath=./Cache/
 #  enter the full path to the GemRB executable      #
 #####################################################
 
-#GemRBPath=./
+GemRBPath=@DATA_DIR@
 
 #####################################################
 #  GemRB GUI Scripts Path [String]                  #
@@ -205,7 +205,7 @@ CachePath=./Cache/
 #  the 'GUIScript' subdirectory.                    #
 #####################################################
 
-#GUIScriptsPath=./
+GUIScriptsPath=@DATA_DIR@
 
 #####################################################
 #  GemRB Plugins Path [String]                      #
@@ -219,7 +219,7 @@ CachePath=./Cache/
 #  GemRB from source directory on Linux.            #
 #####################################################
 
-#PluginsPath=./plugins/
+PluginsPath=@PLUGIN_DIR@
 
 #####################################################
 #  Game Data Path [String]                          #
@@ -252,7 +252,7 @@ CachePath=./Cache/
 #  You probably do NOT want to specify this!        #
 #####################################################
 
-#GemRBOverridePath=/usr/share/games/gemrb
+GemRBOverridePath=@DATA_DIR@
 
 #####################################################
 #  END                                              #

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


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