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

* Mover {CompilerVersion} from the fppkg.cfg template to samplecfg, because

Browse Source 
on Windows it is possible to install fpc in a location without the 
   compilerversion in the path.

git-svn-id: trunk@41184 -
This commit is contained in:
joost 2019-02-03 13:32:43 +00:00
parent cb5a1ed727
commit 6ffe906794
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/utils/samplecfg
View File

@ -98,7 +98,7 @@ fi
# Write fppkg.cfg
echo Writing sample configuration file to $fppkgfile
${FPCMKCFGBIN} -p -3 -d "GlobalPrefix=$FPCGLOBALPREFIX" -d "GlobalPath=$FPCGLOBALPATH" $compilerconfigdir -o $fppkgfile
${FPCMKCFGBIN} -p -3 -d "GlobalPrefix=$FPCGLOBALPREFIX" -d "GlobalPath=$FPCGLOBALPATH/{CompilerVersion}/" $compilerconfigdir -o $fppkgfile
# Write default
echo Writing sample configuration file to $defaultfile

2
utils/fpcmkcfg/fppkg.cfg
View File

@ -14,7 +14,7 @@ InstallRepository=user
[Repository]
Name=fpc
Description=Packages which are installed along with the Free Pascal Compiler
Path=%GlobalPath%/{CompilerVersion}/
Path=%GlobalPath%
Prefix=%GlobalPrefix%
[IncludeFiles]

4
utils/fpcmkcfg/fppkg.inc
View File

@ -20,8 +20,8 @@ const fppkg : array[0..2,1..240] of char=(
'Name=fpc'#010+
'Description=Packages which are installed along with the Free Pascal Co'+
'mpiler'#010+
'Path=%GlobalPath%/{CompilerVersio','n}/'#010+
'Prefix=%GlobalPrefix%'#010+
'Path=%GlobalPath%'#010+
'Prefix=%GlobalP','refix%'#010+
#010+
'[IncludeFiles]'#010+
'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+