Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/gcompris
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2008-03-09 23:41:55 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2008-03-09 23:41:55 (GMT)
commit4948526a3c7f319c0add6518c15a1ef5c18a1a2c (patch)
tree19d3009a2d7430897e1a6397a4ac1e89a2aadc06 /src/gcompris
parent947910cb6403f7875487b49804a7b3a459132774 (diff)
Made the chess activity to search for gnuchess in usual
directory if it is not found in the one detected at compilation time. It is done to accomodate cases were the run time and build time have a different gnuchess package. Commit r3284 (merged from gcomprixo branch) svn path=/trunk/; revision=3286
Diffstat (limited to 'src/gcompris')
-rw-r--r--src/gcompris/gcompris.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 2038c2f..cc65bcb 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -1109,6 +1109,14 @@ static void load_properties ()
else
g_warning("Binary relocation disabled");
+ /* usefull for OSX bundle app */
+#ifdef NSBUNDLE
+ exec_prefix = gcompris_nsbundle_resource ();
+#else
+ exec_prefix = gbr_find_exe_dir("");
+#endif
+ g_warning("exec_prefix %s\n", exec_prefix);
+
prefix_dir = gbr_find_prefix(NULL);
/* Check if we are in the source code (developper usage) */
@@ -1474,15 +1482,6 @@ main (int argc, char *argv[])
GError *error = NULL;
GOptionContext *context;
- /* usefull for OSX bundle app */
-#ifdef NSBUNDLE
- exec_prefix = gcompris_nsbundle_resource ();
- printf("exec_prefix %s\n", exec_prefix);
-#else
- exec_prefix = NULL;
- printf("exec_prefix NULL\n");
-#endif
-
/* First, Remove the gnome crash dialog because it locks the user when in full screen */
signal(SIGSEGV, gc_terminate);
signal(SIGINT, gc_terminate);