From fa1e63d391e6df96b285ac1f16ce0062f693d069 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 9 Feb 2006 15:06:33 +0000 Subject: [PATCH] * from Ales Katona: use $fpcversion instead of fixed version number when generating config git-svn-id: trunk@2498 - --- compiler/utils/samplecfg | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/compiler/utils/samplecfg b/compiler/utils/samplecfg index bad2d8f569..332aac4b07 100644 --- a/compiler/utils/samplecfg +++ b/compiler/utils/samplecfg @@ -65,6 +65,10 @@ else echo Found libgcc.a in $GCCDIR GCCDIR=-Fl$GCCDIR fi + +# set right path to FPC with $fpcversion +FPCPATH=`dirname "$1"`/\$fpcversion + # Write the file echo Writing sample configuration file to $thefile cat < $thefile @@ -195,16 +199,16 @@ cat < $thefile # path to the messagefile, not necessary anymore but can be used to override # the default language -#-Fr$1/msg/errore.msg -#-Fr$1/msg/errorn.msg +#-Fr$FPCPATH/msg/errore.msg +#-Fr$FPCPATH/msg/errorn.msg # searchpath for includefiles #-Fi/pp/inc;/pp/rtl/inc # searchpath for units and other system dependent things --Fu$1/units/\$fpctarget --Fu$1/units/\$fpctarget/* --Fu$1/units/\$fpctarget/rtl +-Fu$FPCPATH/units/\$fpctarget +-Fu$FPCPATH/units/\$fpctarget/* +-Fu$FPCPATH/units/\$fpctarget/rtl #-Fu~/fpc/packages/base/*/units/$fpctarget;~/fpc/fcl/units/$fpctarget;~/fpc/rtl/units/$fpctarget # searchpath for libraries