aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-01 23:46:53 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-09-01 23:46:53 +0000
commitfded3a5ed753bd0fff77fb73ab9abcd8ad715e59 (patch)
tree4e750091c9d2ddd389ea77d5d547f325a204cd53
parente91cea0605045951a3df208d73d93026fef31e8f (diff)
downloadusdx-fded3a5ed753bd0fff77fb73ab9abcd8ad715e59.tar.gz
usdx-fded3a5ed753bd0fff77fb73ab9abcd8ad715e59.tar.xz
usdx-fded3a5ed753bd0fff77fb73ab9abcd8ad715e59.zip
- suffix configure option removed
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1337 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/classes/UPlatformLinux.pas6
-rw-r--r--src/config-darwin.inc3
-rw-r--r--src/config.inc.in3
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 *}