Blob Blame History Raw
diff -up golly-2.1-src/wxgolly.cpp.appdir golly-2.1-src/wxgolly.cpp
--- golly-2.1-src/wxgolly.cpp.appdir	2009-09-06 17:35:55.000000000 -0700
+++ golly-2.1-src/wxgolly.cpp	2010-05-11 20:11:03.000000000 -0700
@@ -289,7 +295,14 @@ bool GollyApp::OnInit()
    SetAppDirectory( wxString(argv[0]).mb_str(wxConvLocal) );
 
    // now set global gollydir for use in GetPrefs and elsewhere
+#ifdef GOLLYDIR
+   // On Fedora, use /usr/share/golly rather than the current directory
+#define QMAKESTR(x) #x
+#define MAKESTR(x) QMAKESTR(x)
+   gollydir = wxT(MAKESTR(GOLLYDIR));
+#else
    gollydir = wxFileName::GetCwd();
+#endif
    if (gollydir.Last() != wxFILE_SEP_PATH) gollydir += wxFILE_SEP_PATH;
    
    // let non-wx modules call Fatal, Warning, BeginProgress, etc