paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 13:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Solved issues setting the default GlobalPrefix and GlobalInstallDir

Browse Source 
git-svn-id: trunk@16929 -
This commit is contained in:
joost 2011-02-17 12:17:31 +00:00
parent 45f6cc6567
commit 5df80040ce
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/fppkg/pkgoptions.pp
View File

@ -571,6 +571,7 @@ end;
procedure TCompilerOptions.InitCompilerDefaults;
var
ACompilerVersion: string;
fpcdir: string;
begin
FConfigVersion:=CurrentConfigVersion;
if fcompiler = '' then
@ -599,7 +600,7 @@ begin
if not(DirectoryExists(FGlobalPrefix+PathDelim+'units')) and
not(DirectoryExists(FGlobalPrefix+PathDelim+'rtl')) then
FGlobalPrefix:=FGlobalPrefix+'..'+PathDelim;
FGlobalPrefix:=ExpandFileName(FGlobalInstallDir);
FGlobalPrefix:=ExpandFileName(FGlobalPrefix);
{$endif unix}
Log(vlDebug,SLogDetectedPrefix,['global',FGlobalPrefix]);
@ -610,12 +611,15 @@ begin
Log(vlDebug,SLogDetectedPrefix,['local',FLocalPrefix]);
end;
FGlobalInstallDir:=FixPath(GetEnvironmentVariable('FPCDIR'));
fpcdir:=FixPath(GetEnvironmentVariable('FPCDIR'));
{$ifndef Unix}
FGlobalInstallDir:=ExpandFileName(FGlobalInstallDir);
fpcdir:=ExpandFileName(fpcdir);
{$endif unix}
if FGlobalInstallDir<>'' then
Log(vlDebug,SLogFPCDirEnv,[FGlobalInstallDir]);
if fpcdir<>'' then
begin
Log(vlDebug,SLogFPCDirEnv,[fpcdir]);
FGlobalInstallDir:=fpcdir;
end;
end;