--- Merging r41184 into '.':

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 -

compiler/utils/samplecfg

@@ -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

utils/fpcmkcfg/fppkg.cfg

@@ -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]

utils/fpcmkcfg/fppkg.inc

@@ -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+