diff options
| author | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-02-09 15:06:33 +0000 |
|---|---|---|
| committer | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-02-09 15:06:33 +0000 |
| commit | cbc04c24f026aaa1ccedc4cfc6d0eab24c7af9b6 (patch) | |
| tree | aafe88e6b019f7ef6b9a1c16bcd817f2fe5ad1e6 /compiler/utils | |
| parent | a675365885e5178e2ac48835dde6d07f096baae1 (diff) | |
| download | fpc-cbc04c24f026aaa1ccedc4cfc6d0eab24c7af9b6.tar.gz | |
* from Ales Katona: use $fpcversion instead of fixed version number when generating config
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@2498 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/samplecfg | 14 |
1 files 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 <<EOFCFG > $thefile @@ -195,16 +199,16 @@ cat <<EOFCFG > $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 |