#61 lnux: if not using configure, search cfg/ for config files

gak · Apr 30, 2012 · 9f12e37 · 9f12e37
1 parent d49538c
commit 9f12e37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/command.c b/src/command.c
@@ -888,11 +888,8 @@ void cmdRunScript(char *arg) {
     sz = strtok(arg, " ");
     if (!sz) return;
     opt = strtok(NULL, " ");
-#ifdef WIN32
-    script=findFile(va("%s/%s", CONFIG_PATH, sz));
-#else
-    script=findFile(sz);
-#endif
+
+    script=findFile(va("%s%s", CONFIG_PATH, sz));
     if ((script != NULL) && (strlen(script)>0)) {
         configRead(script, (opt && !strcmp(opt, "ignoremissing")));
     } else {

diff --git a/src/gravit.h b/src/gravit.h
@@ -61,14 +61,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define SPAWNDIR DATA_DIR "spawn"
 #define MISCDIR DATA_DIR "data"
 
-#ifdef WIN32
-#   define CONFIG_PATH "cfg"
+#if defined(WIN32) || (!defined(HAVE_CONFIG_H) && !defined(__MACH__))
+#   define CONFIG_PATH "cfg/"
 #   define CONFIG_FILE "cfg/gravit.cfg"
 #   define SCREENSAVER_FILE "cfg/screensaver.cfg"
 #   define SCREENSHOT_PATH "screenshots"
 #   define SAVE_PATH "save"
 #else
-#   define CONFIG_PATH "."
+#   define CONFIG_PATH ""
 #   define CONFIG_FILE "gravit.cfg"
 #   define SCREENSAVER_FILE "screensaver.cfg"
 #   ifdef __MACH__