3 files changed, 5 insertions, 7 deletions
diff --git a/src/classes/UPlatformLinux.pas b/src/classes/UPlatformLinux.pas
index 27fb130e..19361a22 100644
--- a/src/classes/UPlatformLinux.pas
+++ b/src/classes/UPlatformLinux.pas
@@ -90,7 +90,7 @@ begin
     {$IFDEF UseLocalDirs}
       Result := ExtractFilePath(ParamStr(0));
     {$ELSE}
-      Result := GetGameUserPath() + 'logs' + PathDelim;
+      Result := GetGameUserPath() + 'logs/';
     {$ENDIF}
   end;
 
@@ -107,7 +107,7 @@ begin
     {$IFDEF UseLocalDirs}
     Result := ExtractFilePath(ParamStr(0));
     {$ELSE}
-    Result := SharedPath + PathDelim;
+    Result := IncludeTrailingPathDelimiter(INSTALL_DATADIR);
     {$ENDIF}
   end;
 end;
@@ -121,7 +121,7 @@ begin
     {$IFDEF UseLocalDirs}
     Result := ExtractFilePath(ParamStr(0));
     {$ELSE}
-    Result := GetHomeDir() + '.'+PathSuffix + PathDelim;
+    Result := GetHomeDir() + '.ultrastardx/';
     {$ENDIF}
   end;
 end;
diff --git a/src/config-darwin.inc b/src/config-darwin.inc
index 13f8aff1..6e191370 100644
--- a/src/config-darwin.inc
+++ b/src/config-darwin.inc
@@ -7,8 +7,7 @@
 
 {$UNDEF UseLocalDirs}
 {$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)}
-  PathSuffix = WideString('ultrastardx');
-  SharedPath = WideString('/usr/local/share/'+PathSuffix);
+  INSTALL_DATADIR = '/usr/local/share/ultrastardx';
 {$IFEND}
 
 {* Libraries *}
diff --git a/src/config.inc.in b/src/config.inc.in
index 6bdf26b5..a9714366 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -7,8 +7,7 @@
 
 {$@DEFINE_USE_LOCAL_DIRS@ UseLocalDirs}
 {$IF (not Defined(UseLocalDirs)) and Defined(IncludeConstants)}
-  PathSuffix = WideString('@suffix@');
-  SharedPath = WideString('@sharerootdir@/'+PathSuffix);
+  INSTALL_DATADIR = '@INSTALL_DATADIR@';
 {$IFEND}
 
 {* Libraries *}