mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-11 19:05:54 +02:00
* Fixed the user-repository path on Windows
git-svn-id: trunk@41197 -
This commit is contained in:
parent
1d7ff66602
commit
5341f6fc7a
@ -166,6 +166,14 @@ begin
|
||||
result := '#DEFINE NEEDCROSSBINUTILS';
|
||||
end;
|
||||
|
||||
function GetDefaultUserPathSuffix: string;
|
||||
begin
|
||||
if not (StringToOS(BuildOSTarget) in AllWindowsOSes) then
|
||||
Result := 'lib/fpc/{CompilerVersion}'
|
||||
else
|
||||
Result := '';
|
||||
end;
|
||||
|
||||
function GetDefaultGCCDir: string;
|
||||
|
||||
var
|
||||
@ -276,6 +284,7 @@ begin
|
||||
TemplateParser.Values['COMPILERCONFIGDIR'] := GetDefaultCompilerConfigDir;
|
||||
TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef;
|
||||
TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR;
|
||||
TemplateParser.Values['USERPATHSUFFIX'] := GetDefaultUserPathSuffix;
|
||||
|
||||
Cfg:=TStringList.Create;
|
||||
Cfg.Text:=StrPas(Addr(DefaultConfig[0][1]));
|
||||
|
@ -18,10 +18,10 @@ Path=%GlobalPath%
|
||||
Prefix=%GlobalPrefix%
|
||||
|
||||
[IncludeFiles]
|
||||
FileMask=%CompilerConfigDir%/conf.d/*.conf
|
||||
FileMask=%CompilerConfigDir%conf.d/*.conf
|
||||
|
||||
[Repository]
|
||||
Name=user
|
||||
Description=User-installed packages
|
||||
Path={LocalRepository}lib/fpc/{CompilerVersion}/
|
||||
Path={LocalRepository}%UserPathSuffix%
|
||||
Prefix={LocalRepository}
|
||||
|
@ -24,11 +24,11 @@ const fppkg : array[0..2,1..240] of char=(
|
||||
'Prefix=%GlobalP','refix%'#010+
|
||||
#010+
|
||||
'[IncludeFiles]'#010+
|
||||
'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+
|
||||
'FileMask=%CompilerConfigDir%conf.d/*.conf'#010+
|
||||
#010+
|
||||
'[Repository]'#010+
|
||||
'Name=user'#010+
|
||||
'Description=User-installed packages'#010+
|
||||
'Path={LocalRepository}lib/fpc/{CompilerVersion}/'#010+
|
||||
'Path={LocalRepository}%UserPathSuffix%'#010+
|
||||
'Prefix={LocalRepository}'#010
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user