From 8efb6f89702c0f726445b92b065be75077a3bea6 Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Tue, 18 Feb 2020 22:27:08 +0000
Subject: [PATCH] --- 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 | 2 +-
 utils/fpcmkcfg/fppkg.cfg | 2 +-
 utils/fpcmkcfg/fppkg.inc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/utils/samplecfg b/compiler/utils/samplecfg
index a589eef597..592b8df23e 100644
--- a/compiler/utils/samplecfg
+++ b/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
diff --git a/utils/fpcmkcfg/fppkg.cfg b/utils/fpcmkcfg/fppkg.cfg
index 473fb70663..4c256895f8 100644
--- a/utils/fpcmkcfg/fppkg.cfg
+++ b/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]
diff --git a/utils/fpcmkcfg/fppkg.inc b/utils/fpcmkcfg/fppkg.inc
index 41d6c4ee69..65e1f7785f 100644
--- a/utils/fpcmkcfg/fppkg.inc
+++ b/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+