* Repositories from the include-files must be processed between the global and user repositories

git-svn-id: trunk@40690 -
This commit is contained in:
joost 2018-12-29 11:45:51 +00:00
parent 953cc76a7b
commit f465826ba9
2 changed files with 7 additions and 9 deletions

View File

@ -17,12 +17,11 @@ Description=Packages which are installed along with the Free Pascal Compiler
Path=%GlobalPath%/{CompilerVersion}/
Prefix=%GlobalPrefix%
[IncludeFiles]
FileMask=%CompilerConfigDir%/conf.d/*.conf
[Repository]
Name=user
Description=User-installed packages
Path={LocalRepository}lib/fpc/{CompilerVersion}/
Prefix={LocalRepository}
[IncludeFiles]
FileMask=%CompilerConfigDir%/conf.d/*.conf

View File

@ -23,13 +23,12 @@ const fppkg : array[0..2,1..240] of char=(
'Path=%GlobalPath%/{CompilerVersio','n}/'#010+
'Prefix=%GlobalPrefix%'#010+
#010+
'[IncludeFiles]'#010+
'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+
#010+
'[Repository]'#010+
'Name=user'#010+
'Description=User-installed packages'#010+
'Path={LocalRepository}lib/fpc/{CompilerVersion}/'#010+
'Prefix={LocalRepository}'#010+
#010+
'[IncludeFiles]'#010+
'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+
#010
'Prefix={LocalRepository}'#010
);