[gemrb] 03/06: DEBIAN: Fix default values for GemRBPath and PluginsPath to match installation folders.

[Beren Minor]

This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch patch-queue/master
in repository gemrb.

commit a8d8e83a0052b716573edc8f6888e121810c99ea
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Fri Aug 15 00:13:08 2014 +0200

    DEBIAN: Fix default values for GemRBPath and PluginsPath to match installation folders.
---
 gemrb/core/Interface.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 1e8ff87..f2d1f38 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -1361,8 +1361,7 @@ int Interface::Init(InterfaceConfig* config)
 	CONFIG_PATH("GameSoundsPath", GameSoundsPath, "sounds");
 
 	// Path configureation
-	CONFIG_PATH("GemRBPath", GemRBPath,
-				CopyGemDataPath(GemRBPath, _MAX_PATH));
+	CONFIG_PATH("GemRBPath", GemRBPath, "/usr/share/gemrb");
 
 	CONFIG_PATH("CachePath", CachePath, "./Cache");
 	FixPath( CachePath, false );
@@ -1375,7 +1374,7 @@ int Interface::Init(InterfaceConfig* config)
 #ifdef PLUGIN_DIR
 	CONFIG_PATH("PluginsPath", PluginsPath, PLUGIN_DIR);
 #else
-	CONFIG_PATH("PluginsPath", PluginsPath, "");
+	CONFIG_PATH("PluginsPath", PluginsPath, "/usr/lib/gemrb/plugins");
 	if (!PluginsPath[0]) {
 		PathJoin( PluginsPath, GemRBPath, "plugins", NULL );
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git