[egoboo/f17] Revert "Paths had been changed in wrong part of ifdef"
Bruno Wolff III
bruno at fedoraproject.org
Fri Apr 27 04:24:40 UTC 2012
commit 6c9b0483be0340d7e187ded152c81ba644f95d19
Author: Bruno Wolff III <bruno at wolff.to>
Date: Thu Apr 26 23:09:19 2012 -0500
Revert "Paths had been changed in wrong part of ifdef"
This reverts commit 9f27774eead73ed3d34cb9387c91ec3e45617b98.
egoboo-paths.patch | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/egoboo-paths.patch b/egoboo-paths.patch
index 1a52e59..92ee2ab 100644
--- a/egoboo-paths.patch
+++ b/egoboo-paths.patch
@@ -1,15 +1,15 @@
---- src/game/platform/file_linux.c.orig 2012-03-11 17:25:58.258258157 -0500
-+++ src/game/platform/file_linux.c 2012-03-11 17:27:08.258154782 -0500
-@@ -79,9 +79,9 @@
- strncpy( linux_dataPath, PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
+--- src/game/platform/file_linux.c.orig 2012-03-11 14:54:05.615088067 -0500
++++ src/game/platform/file_linux.c 2012-03-11 14:56:26.945050377 -0500
+@@ -74,9 +74,9 @@
+ // so that the program will compile and install just like any other
+ // .rpm or .deb package.
+
+- strncpy( linux_configPath, PREFIX "/etc/egoboo-2.x", SDL_arraysize( linux_configPath ) );
+- strncpy( linux_binaryPath, PREFIX "/games/", SDL_arraysize( linux_binaryPath ) );
+- strncpy( linux_dataPath, PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
++ strncpy( linux_configPath, "/etc/egoboo", SDL_arraysize( linux_configPath ) );
++ strncpy( linux_binaryPath, "/usr/bin/", SDL_arraysize( linux_binaryPath ) );
++ strncpy( linux_dataPath, "/usr/share/egoboo", SDL_arraysize( linux_dataPath ) );
#else
// these are read-only directories
-- strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( linux_configPath ) );
-- strncpy( linux_binaryPath, "/games/", SDL_arraysize( linux_binaryPath ) );
-- strncpy( linux_dataPath, "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) );
-+ strncpy( linux_configPath, "/etc/egoboo/", SDL_arraysize( linux_configPath ) );
-+ strncpy( linux_binaryPath, "/usr/bin", SDL_arraysize( linux_binaryPath ) );
-+ strncpy( linux_dataPath, "/usr/share/games/egoboo/", SDL_arraysize( linux_dataPath ) );
- #endif
-
- // the log file cannot be started until there is a user data path to dump the file into
+ strncpy( linux_configPath, "/etc/egoboo-2.x/", SDL_arraysize( linux_configPath ) );
More information about the scm-commits
mailing list