From f465826ba957394e322983913e968570565c9797 Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Sat, 29 Dec 2018 11:45:51 +0000
Subject: [PATCH]  * Repositories from the include-files must be processed
 between the global and user repositories

git-svn-id: trunk@40690 -
---
 utils/fpcmkcfg/fppkg.cfg | 7 +++----
 utils/fpcmkcfg/fppkg.inc | 9 ++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/utils/fpcmkcfg/fppkg.cfg b/utils/fpcmkcfg/fppkg.cfg
index a76cd1565a..a7b20b0e9c 100644
--- a/utils/fpcmkcfg/fppkg.cfg
+++ b/utils/fpcmkcfg/fppkg.cfg
@@ -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
-
diff --git a/utils/fpcmkcfg/fppkg.inc b/utils/fpcmkcfg/fppkg.inc
index ad897069b7..48f57f050e 100644
--- a/utils/fpcmkcfg/fppkg.inc
+++ b/utils/fpcmkcfg/fppkg.inc
@@ -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
 );