Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(revision 11557)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -35,7 +35,7 @@
 if [ $# = 0 ]; then
   echo 'Usage :'
   echo 'samplecfg fpcdir confdir'
-  echo 'fpcdir = Path where FPC is installed'
+  echo 'fpcdir = Prefix where FPC is installed (/usr, /usr/local)'
   echo 'confdir = Path to /etc'
   exit 1
 fi
@@ -161,7 +161,8 @@
 
 
 # set right path to FPC with $fpcversion
-FPCPATH=`dirname "$1"`/\$fpcversion
+FPCPATH32=`dirname "$1"`/lib/fpc/\$fpcversion
+FPCPATH64=`dirname "$1"`/lib64/fpc/\$fpcversion
 
 # Write the file
 echo Writing sample configuration file to $thefile
@@ -297,26 +298,48 @@
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
-#-Fr$FPCPATH/msg/errore.msg
-#-Fr$FPCPATH/msg/errorn.msg
+#-Fr$FPCPATH32/msg/errore.msg
+#-Fr$FPCPATH32/msg/errorn.msg
+#-Fr$FPCPATH64/msg/errore.msg
+#-Fr$FPCPATH64/msg/errorn.msg
 
 # searchpath for includefiles
 #-Fi/pp/inc;/pp/rtl/inc
 
 #IFDEF FPCAPACHE_1_3
--Fu$FPCPATH/units/\$fpctarget/httpd-1.3/
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-1.3/
 #ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd-1.3/
+#ENDIF
+#ELSE
 #IFDEF FPCAPACHE_2_0
--Fu$FPCPATH/units/\$fpctarget/httpd-2.0
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-2.0
 #ELSE
--Fu$FPCPATH/units/\$fpctarget/httpd-2.2
+-Fu$FPCPATH32/units/\$fpctarget/httpd-2.0
 #ENDIF
+#ELSE
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-2.2
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd-2.2
 #ENDIF
+#ENDIF
+#ENDIF
 
 # searchpath for units and other system dependent things
--Fu$FPCPATH/units/\$fpctarget
--Fu$FPCPATH/units/\$fpctarget/*
--Fu$FPCPATH/units/\$fpctarget/rtl
+#IFDEF CPU64
+# 64-bits
+-Fu$FPCPATH64/units/\$fpctarget
+-Fu$FPCPATH64/units/\$fpctarget/*
+-Fu$FPCPATH64/units/\$fpctarget/rtl
+#ELSE
+# 32-bits
+-Fu$FPCPATH32/units/\$fpctarget
+-Fu$FPCPATH32/units/\$fpctarget/*
+-Fu$FPCPATH32/units/\$fpctarget/rtl
+#ENDIF
 #-Fu~/fpc/packages/base/*/units/$fpctarget;~/fpc/fcl/units/$fpctarget;~/fpc/rtl/units/$fpctarget
 
 # searchpath for libraries