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

--- Merging r41184 into '.':

Browse Source 
U    compiler/utils/samplecfg
U    utils/fpcmkcfg/fppkg.cfg
U    utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r41184 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44213 -
This commit is contained in:
joost 2020-02-18 22:27:08 +00:00
parent 10af070def
commit 8efb6f8970
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 # Write fppkg.cfg
echo Writing sample configuration file to $fppkgfile 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 # Write default
echo Writing sample configuration file to $defaultfile echo Writing sample configuration file to $defaultfile

2
utils/fpcmkcfg/fppkg.cfg
View File

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

4
utils/fpcmkcfg/fppkg.inc
View File

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