From 2dbdc474fdf69202030a0b72c7b3bf97909793b4 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 15 Oct 2005 16:36:52 +0000
Subject: [PATCH]   * use register variables when release-building for ppc
 (more or less doubles     performance for most programs)

git-svn-id: trunk@1383 -
---
 Makefile                                      |    4 +-
 compiler/Makefile                             |    4 +-
 compiler/utils/Makefile                       |    4 +-
 fcl/Makefile                                  |    4 +-
 fcl/db/Makefile                               |    4 +-
 fcl/db/dbase/Makefile                         |    4 +-
 fcl/db/interbase/Makefile                     |    4 +-
 fcl/db/memds/Makefile                         |    4 +-
 fcl/db/mysql/Makefile                         |    4 +-
 fcl/db/sdf/Makefile                           |    4 +-
 fcl/db/sqldb/Makefile                         |    4 +-
 fcl/db/sqldb/interbase/Makefile               |    4 +-
 fcl/db/sqldb/mysql/Makefile                   |    4 +-
 fcl/db/sqldb/postgres/Makefile                |    4 +-
 fcl/db/sqlite/Makefile                        |    4 +-
 fcl/db/tests/Makefile                         |    4 +-
 fcl/fpcunit/Makefile                          |    4 +-
 fcl/fpcunit/exampletests/Makefile             |    4 +-
 fcl/image/Makefile                            |    4 +-
 fcl/net/Makefile                              |    4 +-
 fcl/net/tests/Makefile                        |    4 +-
 fcl/passrc/Makefile                           |    4 +-
 fcl/shedit/Makefile                           |    4 +-
 fcl/shedit/gtk/Makefile                       |    4 +-
 fcl/tests/Makefile                            |    4 +-
 fcl/xml/Makefile                              |    4 +-
 fv/Makefile                                   |    4 +-
 fv/test/Makefile                              |    4 +-
 ide/Makefile                                  |    4 +-
 ide/compiler/Makefile                         |    4 +-
 installer/Makefile                            |    4 +-
 packages/Makefile                             |    4 +-
 packages/base/Makefile                        |    4 +-
 packages/base/gdbint/Makefile                 |    4 +-
 packages/base/ibase/Makefile                  |    4 +-
 packages/base/libasync/Makefile               |    4 +-
 packages/base/libc/Makefile                   |    4 +-
 packages/base/md5/Makefile                    |    4 +-
 packages/base/mysql/Makefile                  |    4 +-
 packages/base/netdb/Makefile                  |    4 +-
 packages/base/odbc/Makefile                   |    4 +-
 packages/base/oracle/Makefile                 |    4 +-
 packages/base/oracle/example/Makefile         |    4 +-
 packages/base/pasjpeg/Makefile                |    4 +-
 packages/base/paszlib/Makefile                |    4 +-
 packages/base/postgres/Makefile               |    4 +-
 packages/base/pthreads/Makefile               |    4 +-
 packages/base/regexpr/Makefile                |    4 +-
 packages/base/sqlite/Makefile                 |    4 +-
 packages/extra/Makefile                       |    4 +-
 packages/extra/amunits/Makefile               |    4 +-
 packages/extra/amunits/units/Makefile         |    4 +-
 packages/extra/amunits/utilunits/Makefile     |    4 +-
 packages/extra/bfd/Makefile                   |    4 +-
 packages/extra/cdrom/Makefile                 |    4 +-
 packages/extra/forms/Makefile                 |    4 +-
 packages/extra/forms/demo/Makefile            |    4 +-
 packages/extra/fpgtk/Makefile                 |    4 +-
 packages/extra/gdbm/Makefile                  |    4 +-
 packages/extra/ggi/Makefile                   |    4 +-
 packages/extra/gnome1/Makefile                |    4 +-
 packages/extra/gnome1/gconf/Makefile          |    4 +-
 packages/extra/gnome1/gconf/examples/Makefile |    4 +-
 packages/extra/gnome1/gnome/Makefile          |    4 +-
 packages/extra/gnome1/zvt/Makefile            |    4 +-
 packages/extra/gnome1/zvt/examples/Makefile   |    4 +-
 packages/extra/gtk/Makefile                   |    4 +-
 packages/extra/gtk/examples/Makefile          |    4 +-
 packages/extra/gtk/examples/tutorial/Makefile |    4 +-
 packages/extra/gtk/gtkgl/Makefile             |    4 +-
 packages/extra/gtk2/Makefile                  |    4 +-
 packages/extra/gtk2/examples/Makefile         |    4 +-
 .../gtk2/examples/gettingstarted/Makefile     |    4 +-
 .../extra/gtk2/examples/gtk_demo/Makefile     |    4 +-
 .../extra/gtk2/examples/gtkglext/Makefile     |    4 +-
 .../extra/gtk2/examples/helloworld/Makefile   |    4 +-
 .../extra/gtk2/examples/helloworld2/Makefile  |    4 +-
 packages/extra/gtk2/examples/plugins/Makefile |    4 +-
 .../gtk2/examples/scribble_simple/Makefile    |    4 +-
 packages/extra/imlib/Makefile                 |    4 +-
 packages/extra/libgd/Makefile                 |    4 +-
 packages/extra/libpng/Makefile                |    4 +-
 packages/extra/ncurses/Makefile               |    4 +-
 packages/extra/newt/Makefile                  |    4 +-
 packages/extra/opengl/Makefile                |    4 +-
 packages/extra/opengl/examples/Makefile       |    4 +-
 packages/extra/os2units/Makefile              |    4 +-
 packages/extra/os2units/clkdll/Makefile       |    4 +-
 packages/extra/os2units/ftpapi/Makefile       |    4 +-
 packages/extra/os2units/hwvideo/Makefile      |    4 +-
 packages/extra/os2units/lvm/Makefile          |    4 +-
 packages/extra/os2units/lvm/tests/Makefile    |    4 +-
 packages/extra/os2units/mmtk/Makefile         |    4 +-
 packages/extra/os2units/mmtk/tests/Makefile   |    4 +-
 packages/extra/palmunits/Makefile             |    4 +-
 packages/extra/rexx/Makefile                  |    4 +-
 packages/extra/rexx/test/Makefile             |    4 +-
 packages/extra/svgalib/Makefile               |    4 +-
 packages/extra/syslog/Makefile                |    4 +-
 packages/extra/tcl/Makefile                   |    4 +-
 packages/extra/unixutil/Makefile              |    4 +-
 packages/extra/unzip/Makefile                 |    4 +-
 packages/extra/utmp/Makefile                  |    4 +-
 packages/extra/uuid/Makefile                  |    4 +-
 packages/extra/winunits/Makefile              |    4 +-
 packages/extra/x11/Makefile                   |    4 +-
 packages/extra/zlib/Makefile                  |    4 +-
 rtl/Makefile                                  |    4 +-
 rtl/amiga/Makefile                            |    4 +-
 rtl/beos/Makefile                             |    4 +-
 rtl/darwin/Makefile                           |    4 +-
 rtl/emx/Makefile                              |    4 +-
 rtl/freebsd/Makefile                          |    4 +-
 rtl/go32v2/Makefile                           |    4 +-
 rtl/linux/Makefile                            |    4 +-
 rtl/macos/Makefile                            |    4 +-
 rtl/morphos/Makefile                          |    4 +-
 rtl/netbsd/Makefile                           |    4 +-
 rtl/netware/Makefile                          |    4 +-
 rtl/netwlibc/Makefile                         |    4 +-
 rtl/os2/Makefile                              |    4 +-
 rtl/win32/Makefile                            |    4 +-
 rtl/win64/Makefile                            |    4 +-
 rtl/wince/Makefile                            |    4 +-
 utils/Makefile                                |    4 +-
 utils/dxegen/Makefile                         |    4 +-
 utils/fpcm/Makefile                           |    4 +-
 utils/fpcm/fpcmake.inc                        | 4385 ++++++++---------
 utils/fpcm/fpcmake.ini                        |    2 +-
 utils/fpcres/Makefile                         |    4 +-
 utils/fpdoc/Makefile                          |    4 +-
 utils/fpmc/Makefile                           |    4 +-
 utils/fprcp/Makefile                          |    4 +-
 utils/h2pas/Makefile                          |    4 +-
 utils/tply/Makefile                           |    4 +-
 135 files changed, 2430 insertions(+), 2489 deletions(-)

diff --git a/Makefile b/Makefile
index 0591b68053..22c773e7bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1215,7 +1215,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/compiler/Makefile b/compiler/Makefile
index 38dcb73657..c0071b79ab 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1917,7 +1917,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile
index aa86a2baa9..c596c50e05 100644
--- a/compiler/utils/Makefile
+++ b/compiler/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1585,7 +1585,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/Makefile b/fcl/Makefile
index a38cc5f3c0..134bf4eb71 100644
--- a/fcl/Makefile
+++ b/fcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2525,7 +2525,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/Makefile b/fcl/db/Makefile
index 8eb5d3718b..fc10680472 100644
--- a/fcl/db/Makefile
+++ b/fcl/db/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1900,7 +1900,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/dbase/Makefile b/fcl/db/dbase/Makefile
index 58520ce059..d78634295a 100644
--- a/fcl/db/dbase/Makefile
+++ b/fcl/db/dbase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1515,7 +1515,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/interbase/Makefile b/fcl/db/interbase/Makefile
index b0193a43a7..878b45a097 100644
--- a/fcl/db/interbase/Makefile
+++ b/fcl/db/interbase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1676,7 +1676,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/memds/Makefile b/fcl/db/memds/Makefile
index c0c31d08e6..74826c402c 100644
--- a/fcl/db/memds/Makefile
+++ b/fcl/db/memds/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/mysql/Makefile b/fcl/db/mysql/Makefile
index 30503322ba..f74fcf12d7 100644
--- a/fcl/db/mysql/Makefile
+++ b/fcl/db/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1787,7 +1787,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sdf/Makefile b/fcl/db/sdf/Makefile
index 676b652271..fa6f2069a2 100644
--- a/fcl/db/sdf/Makefile
+++ b/fcl/db/sdf/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sqldb/Makefile b/fcl/db/sqldb/Makefile
index 5870890e93..ebcebd0deb 100644
--- a/fcl/db/sqldb/Makefile
+++ b/fcl/db/sqldb/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1688,7 +1688,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sqldb/interbase/Makefile b/fcl/db/sqldb/interbase/Makefile
index 5ee9edc589..01c3343ef4 100644
--- a/fcl/db/sqldb/interbase/Makefile
+++ b/fcl/db/sqldb/interbase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1454,7 +1454,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sqldb/mysql/Makefile b/fcl/db/sqldb/mysql/Makefile
index cd12d52373..a7dc7dc7f9 100644
--- a/fcl/db/sqldb/mysql/Makefile
+++ b/fcl/db/sqldb/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1454,7 +1454,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sqldb/postgres/Makefile b/fcl/db/sqldb/postgres/Makefile
index 204907e6d6..d8e8d5bd84 100644
--- a/fcl/db/sqldb/postgres/Makefile
+++ b/fcl/db/sqldb/postgres/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1565,7 +1565,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/sqlite/Makefile b/fcl/db/sqlite/Makefile
index 71c412e19c..367999a48e 100644
--- a/fcl/db/sqlite/Makefile
+++ b/fcl/db/sqlite/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1317,7 +1317,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/db/tests/Makefile b/fcl/db/tests/Makefile
index 7c77af4513..24b2871fbe 100644
--- a/fcl/db/tests/Makefile
+++ b/fcl/db/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1917,7 +1917,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/fpcunit/Makefile b/fcl/fpcunit/Makefile
index 0fb0a49276..ad0baf445b 100644
--- a/fcl/fpcunit/Makefile
+++ b/fcl/fpcunit/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1587,7 +1587,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/fpcunit/exampletests/Makefile b/fcl/fpcunit/exampletests/Makefile
index db18fd427a..ea875641e1 100644
--- a/fcl/fpcunit/exampletests/Makefile
+++ b/fcl/fpcunit/exampletests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/image/Makefile b/fcl/image/Makefile
index 3fa13a18df..210d0346ee 100644
--- a/fcl/image/Makefile
+++ b/fcl/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1602,7 +1602,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/net/Makefile b/fcl/net/Makefile
index df8d3c9403..c498544cc5 100644
--- a/fcl/net/Makefile
+++ b/fcl/net/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1644,7 +1644,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/net/tests/Makefile b/fcl/net/tests/Makefile
index 18917b2971..68b97182fd 100644
--- a/fcl/net/tests/Makefile
+++ b/fcl/net/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2028,7 +2028,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/passrc/Makefile b/fcl/passrc/Makefile
index 21dd80e287..9c62e017a1 100644
--- a/fcl/passrc/Makefile
+++ b/fcl/passrc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/shedit/Makefile b/fcl/shedit/Makefile
index f4e747a196..6529332d99 100644
--- a/fcl/shedit/Makefile
+++ b/fcl/shedit/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile
index 7f46e092eb..e3f19f9eb5 100644
--- a/fcl/shedit/gtk/Makefile
+++ b/fcl/shedit/gtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2086,7 +2086,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile
index 0f9e310a7d..3f92b24d6e 100644
--- a/fcl/tests/Makefile
+++ b/fcl/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1917,7 +1917,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fcl/xml/Makefile b/fcl/xml/Makefile
index 9abf106422..4f02db0f2e 100644
--- a/fcl/xml/Makefile
+++ b/fcl/xml/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fv/Makefile b/fv/Makefile
index 1c9bbca48a..751fa3720e 100644
--- a/fv/Makefile
+++ b/fv/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1588,7 +1588,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/fv/test/Makefile b/fv/test/Makefile
index c2eafa63ac..852cd77176 100644
--- a/fv/test/Makefile
+++ b/fv/test/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1314,7 +1314,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/ide/Makefile b/ide/Makefile
index 5e54f94665..d243ccb67f 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1714,7 +1714,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/ide/compiler/Makefile b/ide/compiler/Makefile
index 969ec15116..65eafce8fa 100644
--- a/ide/compiler/Makefile
+++ b/ide/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1601,7 +1601,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/installer/Makefile b/installer/Makefile
index 8322d03117..c789bcc52f 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1542,7 +1542,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/Makefile b/packages/Makefile
index 9bb4e0b740..e0982aa9f5 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1115,7 +1115,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/Makefile b/packages/base/Makefile
index 995a5d068e..fb4a8b1a33 100644
--- a/packages/base/Makefile
+++ b/packages/base/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1115,7 +1115,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/gdbint/Makefile b/packages/base/gdbint/Makefile
index 6f3e4d84b0..bc68dfc5ec 100644
--- a/packages/base/gdbint/Makefile
+++ b/packages/base/gdbint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1633,7 +1633,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/ibase/Makefile b/packages/base/ibase/Makefile
index 8dfacbf43a..745cedb2fb 100644
--- a/packages/base/ibase/Makefile
+++ b/packages/base/ibase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/libasync/Makefile b/packages/base/libasync/Makefile
index 85442442b8..3db47c55db 100644
--- a/packages/base/libasync/Makefile
+++ b/packages/base/libasync/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1305,7 +1305,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/libc/Makefile b/packages/base/libc/Makefile
index 342289e012..2ef52df72e 100644
--- a/packages/base/libc/Makefile
+++ b/packages/base/libc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1280,7 +1280,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/md5/Makefile b/packages/base/md5/Makefile
index 979ce95924..df2165352b 100644
--- a/packages/base/md5/Makefile
+++ b/packages/base/md5/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/mysql/Makefile b/packages/base/mysql/Makefile
index 86db3a55ab..671e5bab11 100644
--- a/packages/base/mysql/Makefile
+++ b/packages/base/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/netdb/Makefile b/packages/base/netdb/Makefile
index 1447165268..16f740a158 100644
--- a/packages/base/netdb/Makefile
+++ b/packages/base/netdb/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/odbc/Makefile b/packages/base/odbc/Makefile
index 4692a8ef5c..01d26fc747 100644
--- a/packages/base/odbc/Makefile
+++ b/packages/base/odbc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/oracle/Makefile b/packages/base/oracle/Makefile
index 18afa3a565..fcf6dadd52 100644
--- a/packages/base/oracle/Makefile
+++ b/packages/base/oracle/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/oracle/example/Makefile b/packages/base/oracle/example/Makefile
index 3fb3c7ca00..395e137ca8 100644
--- a/packages/base/oracle/example/Makefile
+++ b/packages/base/oracle/example/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1980,7 +1980,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/pasjpeg/Makefile b/packages/base/pasjpeg/Makefile
index a0b8d33000..0d6f82ce7a 100644
--- a/packages/base/pasjpeg/Makefile
+++ b/packages/base/pasjpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/paszlib/Makefile b/packages/base/paszlib/Makefile
index ea6b39722b..41ef22b35f 100644
--- a/packages/base/paszlib/Makefile
+++ b/packages/base/paszlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/postgres/Makefile b/packages/base/postgres/Makefile
index 02e3c7f084..21a844c81d 100644
--- a/packages/base/postgres/Makefile
+++ b/packages/base/postgres/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/pthreads/Makefile b/packages/base/pthreads/Makefile
index a46804f35b..f154f30f9a 100644
--- a/packages/base/pthreads/Makefile
+++ b/packages/base/pthreads/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/regexpr/Makefile b/packages/base/regexpr/Makefile
index 679a0dffdf..dcfb2973f6 100644
--- a/packages/base/regexpr/Makefile
+++ b/packages/base/regexpr/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1476,7 +1476,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/base/sqlite/Makefile b/packages/base/sqlite/Makefile
index dd727d80d4..c9930c75e5 100644
--- a/packages/base/sqlite/Makefile
+++ b/packages/base/sqlite/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/Makefile b/packages/extra/Makefile
index e2238dc2e3..dc051e6fda 100644
--- a/packages/extra/Makefile
+++ b/packages/extra/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1079,7 +1079,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/amunits/Makefile b/packages/extra/amunits/Makefile
index 34718b3f31..4485acec88 100644
--- a/packages/extra/amunits/Makefile
+++ b/packages/extra/amunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1338,7 +1338,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/amunits/units/Makefile b/packages/extra/amunits/units/Makefile
index 96a7cf7bd1..1a041b78d6 100644
--- a/packages/extra/amunits/units/Makefile
+++ b/packages/extra/amunits/units/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1587,7 +1587,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/amunits/utilunits/Makefile b/packages/extra/amunits/utilunits/Makefile
index 10011c856b..38b16b77a4 100644
--- a/packages/extra/amunits/utilunits/Makefile
+++ b/packages/extra/amunits/utilunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1587,7 +1587,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/bfd/Makefile b/packages/extra/bfd/Makefile
index 759534317e..c48620c5a3 100644
--- a/packages/extra/bfd/Makefile
+++ b/packages/extra/bfd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/cdrom/Makefile b/packages/extra/cdrom/Makefile
index 5fe8dbf2d3..71b7349cb0 100644
--- a/packages/extra/cdrom/Makefile
+++ b/packages/extra/cdrom/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1389,7 +1389,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/forms/Makefile b/packages/extra/forms/Makefile
index 924c250a96..cc9e3ac734 100644
--- a/packages/extra/forms/Makefile
+++ b/packages/extra/forms/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1565,7 +1565,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/forms/demo/Makefile b/packages/extra/forms/demo/Makefile
index 252f34a76b..3ef6d562d7 100644
--- a/packages/extra/forms/demo/Makefile
+++ b/packages/extra/forms/demo/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1404,7 +1404,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/fpgtk/Makefile b/packages/extra/fpgtk/Makefile
index c3ea3c7639..c2a2be3961 100644
--- a/packages/extra/fpgtk/Makefile
+++ b/packages/extra/fpgtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2088,7 +2088,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gdbm/Makefile b/packages/extra/gdbm/Makefile
index eb13107344..7b9c8212ef 100644
--- a/packages/extra/gdbm/Makefile
+++ b/packages/extra/gdbm/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/ggi/Makefile b/packages/extra/ggi/Makefile
index d9e3a138a1..5f00ae13f9 100644
--- a/packages/extra/ggi/Makefile
+++ b/packages/extra/ggi/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/Makefile b/packages/extra/gnome1/Makefile
index 6912b48c52..eed94f2d4c 100644
--- a/packages/extra/gnome1/Makefile
+++ b/packages/extra/gnome1/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1115,7 +1115,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/gconf/Makefile b/packages/extra/gnome1/gconf/Makefile
index 933c419f93..157f67700e 100644
--- a/packages/extra/gnome1/gconf/Makefile
+++ b/packages/extra/gnome1/gconf/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1671,7 +1671,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/gconf/examples/Makefile b/packages/extra/gnome1/gconf/examples/Makefile
index 8b5051a76c..5bea8a5f3c 100644
--- a/packages/extra/gnome1/gconf/examples/Makefile
+++ b/packages/extra/gnome1/gconf/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1621,7 +1621,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/gnome/Makefile b/packages/extra/gnome1/gnome/Makefile
index 64806861ce..68625aab6b 100644
--- a/packages/extra/gnome1/gnome/Makefile
+++ b/packages/extra/gnome1/gnome/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1643,7 +1643,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/zvt/Makefile b/packages/extra/gnome1/zvt/Makefile
index eee3229f0d..30f388f888 100644
--- a/packages/extra/gnome1/zvt/Makefile
+++ b/packages/extra/gnome1/zvt/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1754,7 +1754,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gnome1/zvt/examples/Makefile b/packages/extra/gnome1/zvt/examples/Makefile
index 57a9f14bd2..a4f8b26876 100644
--- a/packages/extra/gnome1/zvt/examples/Makefile
+++ b/packages/extra/gnome1/zvt/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1767,7 +1767,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk/Makefile b/packages/extra/gtk/Makefile
index b0810591ba..1c9660c759 100644
--- a/packages/extra/gtk/Makefile
+++ b/packages/extra/gtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1719,7 +1719,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk/examples/Makefile b/packages/extra/gtk/examples/Makefile
index 3156fabd71..11a5d96f05 100644
--- a/packages/extra/gtk/examples/Makefile
+++ b/packages/extra/gtk/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1669,7 +1669,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk/examples/tutorial/Makefile b/packages/extra/gtk/examples/tutorial/Makefile
index 28e6734b76..c730bca9dd 100644
--- a/packages/extra/gtk/examples/tutorial/Makefile
+++ b/packages/extra/gtk/examples/tutorial/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1273,7 +1273,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk/gtkgl/Makefile b/packages/extra/gtk/gtkgl/Makefile
index 781282751e..0351f50606 100644
--- a/packages/extra/gtk/gtkgl/Makefile
+++ b/packages/extra/gtk/gtkgl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1497,7 +1497,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/Makefile b/packages/extra/gtk2/Makefile
index 6ae37440aa..d097cf4fc9 100644
--- a/packages/extra/gtk2/Makefile
+++ b/packages/extra/gtk2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1614,7 +1614,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/Makefile b/packages/extra/gtk2/examples/Makefile
index 1c0c3f0e60..3237fabea0 100644
--- a/packages/extra/gtk2/examples/Makefile
+++ b/packages/extra/gtk2/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1384,7 +1384,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/gettingstarted/Makefile b/packages/extra/gtk2/examples/gettingstarted/Makefile
index ce7fdf4caf..10e2d7effc 100644
--- a/packages/extra/gtk2/examples/gettingstarted/Makefile
+++ b/packages/extra/gtk2/examples/gettingstarted/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/gtk_demo/Makefile b/packages/extra/gtk2/examples/gtk_demo/Makefile
index ef90a6d143..feebbbf2de 100644
--- a/packages/extra/gtk2/examples/gtk_demo/Makefile
+++ b/packages/extra/gtk2/examples/gtk_demo/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/gtkglext/Makefile b/packages/extra/gtk2/examples/gtkglext/Makefile
index 7b2c759ccc..95909e4cdd 100644
--- a/packages/extra/gtk2/examples/gtkglext/Makefile
+++ b/packages/extra/gtk2/examples/gtkglext/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1447,7 +1447,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/helloworld/Makefile b/packages/extra/gtk2/examples/helloworld/Makefile
index dd45e9901d..05cf759d35 100644
--- a/packages/extra/gtk2/examples/helloworld/Makefile
+++ b/packages/extra/gtk2/examples/helloworld/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/helloworld2/Makefile b/packages/extra/gtk2/examples/helloworld2/Makefile
index 63040e172d..90f7ab76d9 100644
--- a/packages/extra/gtk2/examples/helloworld2/Makefile
+++ b/packages/extra/gtk2/examples/helloworld2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/plugins/Makefile b/packages/extra/gtk2/examples/plugins/Makefile
index 198f59e0b9..d20d8c9472 100644
--- a/packages/extra/gtk2/examples/plugins/Makefile
+++ b/packages/extra/gtk2/examples/plugins/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/gtk2/examples/scribble_simple/Makefile b/packages/extra/gtk2/examples/scribble_simple/Makefile
index afc00e914d..db664fbbd8 100644
--- a/packages/extra/gtk2/examples/scribble_simple/Makefile
+++ b/packages/extra/gtk2/examples/scribble_simple/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1341,7 +1341,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/imlib/Makefile b/packages/extra/imlib/Makefile
index f7773035e5..cc72218296 100644
--- a/packages/extra/imlib/Makefile
+++ b/packages/extra/imlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1581,7 +1581,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/libgd/Makefile b/packages/extra/libgd/Makefile
index 734a911337..a55031f5cd 100644
--- a/packages/extra/libgd/Makefile
+++ b/packages/extra/libgd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/libpng/Makefile b/packages/extra/libpng/Makefile
index 6e033d55a3..537a0f7264 100644
--- a/packages/extra/libpng/Makefile
+++ b/packages/extra/libpng/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1343,7 +1343,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/ncurses/Makefile b/packages/extra/ncurses/Makefile
index 51c3f4e183..02a7435869 100644
--- a/packages/extra/ncurses/Makefile
+++ b/packages/extra/ncurses/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/newt/Makefile b/packages/extra/newt/Makefile
index 269cd6c849..1a6c57fea9 100644
--- a/packages/extra/newt/Makefile
+++ b/packages/extra/newt/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/opengl/Makefile b/packages/extra/opengl/Makefile
index eb47fbe1f0..72daae8e05 100644
--- a/packages/extra/opengl/Makefile
+++ b/packages/extra/opengl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1434,7 +1434,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/opengl/examples/Makefile b/packages/extra/opengl/examples/Makefile
index 189dfcf07a..d0584f5956 100644
--- a/packages/extra/opengl/examples/Makefile
+++ b/packages/extra/opengl/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1495,7 +1495,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/Makefile b/packages/extra/os2units/Makefile
index 62d82b3829..8c61c8b21e 100644
--- a/packages/extra/os2units/Makefile
+++ b/packages/extra/os2units/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1115,7 +1115,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/clkdll/Makefile b/packages/extra/os2units/clkdll/Makefile
index 0206c231dc..87ec19fd26 100644
--- a/packages/extra/os2units/clkdll/Makefile
+++ b/packages/extra/os2units/clkdll/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/ftpapi/Makefile b/packages/extra/os2units/ftpapi/Makefile
index c7f4827dfe..cedc82d862 100644
--- a/packages/extra/os2units/ftpapi/Makefile
+++ b/packages/extra/os2units/ftpapi/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/hwvideo/Makefile b/packages/extra/os2units/hwvideo/Makefile
index f8ca19f1c3..c5562edcd3 100644
--- a/packages/extra/os2units/hwvideo/Makefile
+++ b/packages/extra/os2units/hwvideo/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/lvm/Makefile b/packages/extra/os2units/lvm/Makefile
index c5a121da4b..cd721804a1 100644
--- a/packages/extra/os2units/lvm/Makefile
+++ b/packages/extra/os2units/lvm/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/lvm/tests/Makefile b/packages/extra/os2units/lvm/tests/Makefile
index e3c6be17e6..d02a2c8c93 100644
--- a/packages/extra/os2units/lvm/tests/Makefile
+++ b/packages/extra/os2units/lvm/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1252,7 +1252,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/mmtk/Makefile b/packages/extra/os2units/mmtk/Makefile
index e77c51d812..02c3dab762 100644
--- a/packages/extra/os2units/mmtk/Makefile
+++ b/packages/extra/os2units/mmtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/os2units/mmtk/tests/Makefile b/packages/extra/os2units/mmtk/tests/Makefile
index f20473090f..16882841e6 100644
--- a/packages/extra/os2units/mmtk/tests/Makefile
+++ b/packages/extra/os2units/mmtk/tests/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1252,7 +1252,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/palmunits/Makefile b/packages/extra/palmunits/Makefile
index a771723c6d..bf694327ee 100644
--- a/packages/extra/palmunits/Makefile
+++ b/packages/extra/palmunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/rexx/Makefile b/packages/extra/rexx/Makefile
index b7aeea0266..295231a5bd 100644
--- a/packages/extra/rexx/Makefile
+++ b/packages/extra/rexx/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/rexx/test/Makefile b/packages/extra/rexx/test/Makefile
index d86f868b56..45d3784f33 100644
--- a/packages/extra/rexx/test/Makefile
+++ b/packages/extra/rexx/test/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1315,7 +1315,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/svgalib/Makefile b/packages/extra/svgalib/Makefile
index f7edfee71a..d9338abbd2 100644
--- a/packages/extra/svgalib/Makefile
+++ b/packages/extra/svgalib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/syslog/Makefile b/packages/extra/syslog/Makefile
index b6b87f661a..e136c8099c 100644
--- a/packages/extra/syslog/Makefile
+++ b/packages/extra/syslog/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1391,7 +1391,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/tcl/Makefile b/packages/extra/tcl/Makefile
index 8e049e7be4..63d03f0c64 100644
--- a/packages/extra/tcl/Makefile
+++ b/packages/extra/tcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1919,7 +1919,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/unixutil/Makefile b/packages/extra/unixutil/Makefile
index 1ec78d181c..a4dfd59309 100644
--- a/packages/extra/unixutil/Makefile
+++ b/packages/extra/unixutil/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1982,7 +1982,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/unzip/Makefile b/packages/extra/unzip/Makefile
index 7f05494dac..b805b97f81 100644
--- a/packages/extra/unzip/Makefile
+++ b/packages/extra/unzip/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1254,7 +1254,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/utmp/Makefile b/packages/extra/utmp/Makefile
index 3578f776d5..aa81944dea 100644
--- a/packages/extra/utmp/Makefile
+++ b/packages/extra/utmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/uuid/Makefile b/packages/extra/uuid/Makefile
index 0d2a3c2efd..a73e8f0581 100644
--- a/packages/extra/uuid/Makefile
+++ b/packages/extra/uuid/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1365,7 +1365,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/winunits/Makefile b/packages/extra/winunits/Makefile
index 9ab9d804e5..474e6f7a6e 100644
--- a/packages/extra/winunits/Makefile
+++ b/packages/extra/winunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1588,7 +1588,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/x11/Makefile b/packages/extra/x11/Makefile
index 6719100d99..72e2cf55db 100644
--- a/packages/extra/x11/Makefile
+++ b/packages/extra/x11/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1280,7 +1280,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/packages/extra/zlib/Makefile b/packages/extra/zlib/Makefile
index 4088e6f8d9..4adf6d53e5 100644
--- a/packages/extra/zlib/Makefile
+++ b/packages/extra/zlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1280,7 +1280,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/Makefile b/rtl/Makefile
index 54bab7539c..9f56401aa3 100644
--- a/rtl/Makefile
+++ b/rtl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1090,7 +1090,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index 633c6907a5..7fd620880c 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1582,7 +1582,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index 2d3bad8520..cf4fbd3095 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1572,7 +1572,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index 2ff873607a..44d6a31eb2 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1474,7 +1474,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 816429bc4f..01b7f43740 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1577,7 +1577,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index a0841b72b4..d63d37a2fb 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1591,7 +1591,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index 4ba480b772..85b723817d 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1578,7 +1578,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index aa6244a759..467d1af531 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1821,7 +1821,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 7867aea76e..e4c69c3112 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1354,7 +1354,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index acaa21bf00..3850442f28 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1573,7 +1573,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index b124c2c093..1362ad3641 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1587,7 +1587,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index fdae2b654a..137e99825b 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1579,7 +1579,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index ba376f4c59..449c31c16c 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1574,7 +1574,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index afc2a1ce07..6fc16b3051 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1577,7 +1577,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 0ce029d0fd..4f9bc14f3d 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1576,7 +1576,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index c5dec43ae0..bb3dc02a94 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1463,7 +1463,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index 297f59ec43..67a11b4da2 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1465,7 +1465,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/Makefile b/utils/Makefile
index dd276cc9f0..3b8af00566 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2141,7 +2141,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile
index 2e621d1532..c67b8de8ac 100644
--- a/utils/dxegen/Makefile
+++ b/utils/dxegen/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1255,7 +1255,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile
index b4d273ec77..2ad3bbc32d 100644
--- a/utils/fpcm/Makefile
+++ b/utils/fpcm/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2028,7 +2028,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 59e5bcf1ea..cff3b10807 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1,2292 +1,2233 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..214] of string[240]=(
+const fpcmakeini : array[0..205] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..214,1..240] of char=(
+const fpcmakeini : array[0..205,1..240] of char=(
 {$endif Delphi}
-  ';'#013#010+
-  '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#013+
+  ';'#010+
+  '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
+  ';'#010+
   #010+
-  ';'#013#010+
-  #013#010+
-  '[defines]'#013#010+
-  '#####################################################################'#013+
+  '[defines]'#010+
+  '#####################################################################'#010+
+  '# Misc defines to be used by anyone'#010+
+  '####################################################','################'+
+  '#'#010+
   #010+
-  '# Misc defines to be used by anyone'#013#010+
-  '#############################################','#######################'+
-  '#'#013#010+
-  #013#010+
-  '# OS categories'#013#010+
-  'BSDs = freebsd netbsd openbsd darwin'#013#010+
-  'UNIXs = linux $(BSDs) solaris qnx'#013#010+
-  'LIMIT83fs = go32v2 os2 emx watcom'#013#010+
-  #013#010+
-  '#Empty target for rules that always should run. Needed if'#013#010+
-  '#the target is non-phoney,',' and there is non-phony prereqisites.'#013#010+
-  '#Then add FORCE as an prerequisite'#013#010+
-  '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#013#010+
-  'FORCE:'#013#010+
-  '.PHONY: FORCE'#013#010+
-  #013#010+
-  '[osdetect]'#013#010+
-  '#############################################################','#######'+
-  '#'#013#010+
-  '# Autodetect source OS (Linux or Dos or Windows NT or OS/2 or other)'#013+
+  '# OS categories'#010+
+  'BSDs = freebsd netbsd openbsd darwin'#010+
+  'UNIXs = linux $(BSDs) solaris qnx'#010+
+  'LIMIT83fs = go32v2 os2 emx watcom'#010+
   #010+
-  '# define inUnix when running under Unix like environment'#013#010+
-  '#               (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,Cygwin)'#013#010+
-  '# define inWinNT when running under WinN','T'#013#010+
-  '# define inOS2 when running under OS/2'#013#010+
-  '# define inCygwin when running under Cygwin32'#013#010+
-  '#####################################################################'#013+
+  '#Empty target for rules that always should run. Needed if'#010+
+  '#the target is non-phoney, and there is n','on-phony prereqisites.'#010+
+  '#Then add FORCE as an prerequisite'#010+
+  '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#010+
+  'FORCE:'#010+
+  '.PHONY: FORCE'#010+
+  #010+
+  '[osdetect]'#010+
+  '#####################################################################'#010+
+  '# Autodetect ','source OS (Linux or Dos or Windows NT or OS/2 or other)'+
+  #010+
+  '# define inUnix when running under Unix like environment'#010+
+  '#               (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,Cygwin)'#010+
+  '# define inWinNT when running under WinNT'#010+
+  '# define inOS2 when runn','ing under OS/2'#010+
+  '# define inCygwin when running under Cygwin32'#010+
+  '#####################################################################'#010+
+  #010+
+  '# We need only / in the path also remove the current dir,'#010+
+  '# also remove trailing /'#039's'#010+
+  'override PATH:=$(patsub','st %/,%,$(subst \,/,$(PATH)))'#010+
+  #010+
+  '# Detect unix'#010+
+  '# Darwin is handled specially'#010+
+  'ifneq ($(findstring darwin,$(OSTYPE)),)'#010+
+  'inUnix=1 #darwin'#010+
+  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+
+  'else'#010+
+  '# Determine if we'#039've a unix searchpath by looking for ','a ;'#010+
+  '# that normally doesn'#039't exists in the unix PATH var.'#010+
+  'ifeq ($(findstring ;,$(PATH)),)'#010+
+  'inUnix=1'#010+
+  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+
+  'else'#010+
+  'SEARCHPATH:=$(subst ;, ,$(PATH))'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Add path were make is located'#010+
+  'SEARCHPATH','+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#010+
+  #010+
+  '# Search for PWD'#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#010+
+  'ifeq ($(PWD),)'#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))'#010+
+  'ifeq ($(PWD),)'#010+
+  '$(error You need the GNU ','utils package to use this Makefile)'#010+
+  'else'#010+
+  'PWD:=$(firstword $(PWD))'#010+
+  'SRCEXEEXT='#010+
+  'endif'#010+
+  'else'#010+
+  'PWD:=$(firstword $(PWD))'#010+
+  'SRCEXEEXT=.exe'#010+
+  'endif'#010+
+  #010+
+  '# Detect NT - NT sets OS to Windows_NT'#010+
+  '# Detect OS/2 - OS/2 has OS2_SHELL defined'#010+
+  'ifndef inUnix'#010+
+  'ifeq ($(O','S),Windows_NT)'#010+
+  'inWinNT=1'#010+
+  'else'#010+
+  'ifdef OS2_SHELL'#010+
+  'inOS2=1'#010+
+  'endif'#010+
+  'endif'#010+
+  'else'#010+
+  'ifneq ($(findstring cygdrive,$(PATH)),)'#010+
+  'inCygWin=1'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# The extension of batch files / scripts'#010+
+  'ifdef inUnix'#010+
+  'SRCBATCHEXT=.sh'#010+
+  'else'#010+
+  'ifdef inOS2'#010+
+  'SRCBATCHEXT=.cmd'#010+
+  'e','lse'#010+
+  'SRCBATCHEXT=.bat'#010+
+  'endif'#010+
+  'endif'#010+
   #010+
-  #013#010+
-  '# We need only / in the path also remove the current dir,'#013#010+
-  '# also remove trai','ling /'#039's'#013#010+
-  'override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))'#013#010+
-  #013#010+
-  '# Detect unix'#013#010+
-  '# Darwin is handled specially'#013#010+
-  'ifneq ($(findstring darwin,$(OSTYPE)),)'#013#010+
-  'inUnix=1 #darwin'#013#010+
-  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#013#010+
-  'else'#013#010+
-  '# Determine i','f we'#039've a unix searchpath by looking for a ;'#013#010+
-  '# that normally doesn'#039't exists in the unix PATH var.'#013#010+
-  'ifeq ($(findstring ;,$(PATH)),)'#013#010+
-  'inUnix=1'#013#010+
-  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#013#010+
-  'else'#013#010+
-  'SEARCHPATH:=$(subst ;, ,$(PATH))'#013#010+
-  'endif'#013#010,
-  'endif'#013#010+
-  #013#010+
-  '# Add path were make is located'#013#010+
-  'SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#013#010+
-  #013#010+
-  '# Search for PWD'#013#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#013#010+
-  'ifeq ($(PWD),)'#013#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd,','$(SEARCHPATH))))'#013#010+
-  'ifeq ($(PWD),)'#013#010+
-  '$(error You need the GNU utils package to use this Makefile)'#013#010+
-  'else'#013#010+
-  'PWD:=$(firstword $(PWD))'#013#010+
-  'SRCEXEEXT='#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'PWD:=$(firstword $(PWD))'#013#010+
-  'SRCEXEEXT=.exe'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Detect NT - NT sets OS to Windows_','NT'#013#010+
-  '# Detect OS/2 - OS/2 has OS2_SHELL defined'#013#010+
-  'ifndef inUnix'#013#010+
-  'ifeq ($(OS),Windows_NT)'#013#010+
-  'inWinNT=1'#013#010+
-  'else'#013#010+
-  'ifdef OS2_SHELL'#013#010+
-  'inOS2=1'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ifneq ($(findstring cygdrive,$(PATH)),)'#013#010+
-  'inCygWin=1'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# The extension of b','atch files / scripts'#013#010+
-  'ifdef inUnix'#013#010+
-  'SRCBATCHEXT=.sh'#013#010+
-  'else'#013#010+
-  'ifdef inOS2'#013#010+
-  'SRCBATCHEXT=.cmd'#013#010+
-  'else'#013#010+
-  'SRCBATCHEXT=.bat'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
   '# Path Separator, the subst trick is necessary for the \ that can'#039't'+
-  ' exists'#013#010+
-  '# at the end of a line'#013#010+
-  'ifdef inUn','ix'#013#010+
-  'PATHSEP=/'#013#010+
-  'else'#013#010+
-  'PATHSEP:=$(subst /,\,/)'#013#010+
-  '# cygwin bash or sh can not handle backslashs'#013#010+
-  'ifdef inCygWin'#013#010+
-  'PATHSEP=/'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Base dir'#013#010+
-  'ifdef PWD'#013#010+
-  'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#013#010+
-  '# For Cygwin we need to replace /cygdrive/','c/ with c:/'#013#010+
-  'ifdef inCygWin'#013#010+
-  'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#013#010+
-  'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#013#010+
-  'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#013#010+
-  'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR)',')'#013+
+  ' exists'#010+
+  '# at the end of a line'#010+
+  'ifdef inUnix'#010+
+  'PATHSEP=/'#010+
+  'else'#010+
+  'PATHSEP:=$(subst /,\,/)'#010+
+  '# cygwin bash or sh can not handle backslashs'#010+
+  'ifdef inCy','gWin'#010+
+  'PATHSEP=/'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Base dir'#010+
+  'ifdef PWD'#010+
+  'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+
+  '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+
+  'ifdef inCygWin'#010+
+  'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+
+  'BASENODIR:=$(patsubst /cygdrive%,%,$(BA','SEDIR))'#010+
+  'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#010+
+  'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+
+  'endif'#010+
+  'endif'#010+
+  'else'#010+
+  'BASEDIR=.'#010+
+  'endif'#010+
   #010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'BASEDIR=.'#013#010+
-  'endif'#013#010+
-  #013#010+
   '# Echo is an internal command under OS/2 (and others), so it'#039's alw'+
-  'ays found'#013#010+
-  'ifdef inOS2'#013#010+
-  'ifndef ECHO'#013#010+
+  'ays found'#010+
+  'ifde','f inOS2'#010+
+  'ifndef ECHO'#010+
   'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))'+
-  '))'#013#010+
-  'ifeq ($(ECHO),)'#013#010+
-  'ECH','O:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)'+
-  ')))'#013#010+
-  'ifeq ($(ECHO),)'#013#010+
-  'ECHO=echo'#013#010+
-  'else'#013#010+
-  'ECHO:=$(firstword $(ECHO))'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ECHO:=$(firstword $(ECHO))'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'export ECHO'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '[fpcdetect]'#013#010+
-  '##################','##################################################'+
-  '#'#013#010+
-  '# FPC Binary and Version Detection'#013#010+
-  '#####################################################################'#013+
+  '))'#010+
+  'ifeq ($(ECHO),)'#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+
+  ')'#010+
+  'ifeq ($(ECHO),)'#010+
+  'ECHO=echo'#010+
+  'else'#010+
+  'ECHO:=$(firstword $(ECHO))'#010+
+  'e','ndif'#010+
+  'else'#010+
+  'ECHO:=$(firstword $(ECHO))'#010+
+  'endif'#010+
+  'endif'#010+
+  'export ECHO'#010+
+  'endif'#010+
   #010+
-  #013#010+
-  '# Compatibility with old makefiles'#013#010+
-  'ifndef FPC'#013#010+
-  'ifdef PP'#013#010+
-  'FPC=$(PP)'#013#010+
-  'endif'#013#010+
-  'en','dif'#013#010+
-  #013#010+
-  '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#013#010+
-  '# to query for the default ppcXXX the fpc executable tries. When'#013#010+
-  '# fpc is not found use ppc386 by default. Also when fpc -PB gives'#013#010+
-  '# an error ppc386 will be used.'#013#010+
-  'i','fndef FPC'#013#010+
-  '# check if fpc exists'#013#010+
-  'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+
-  ')))'#013#010+
-  'ifneq ($(FPCPROG),)'#013#010+
-  'FPCPROG:=$(firstword $(FPCPROG))'#013#010+
-  'FPC:=$(shell $(FPCPROG) -PB)'#013#010+
-  '# Older fpc executables didn'#039't support it and ','return'#013#010+
-  '# Error: Illegal processor... If found then fallback to ppc386'#013#010+
-  'ifneq ($(findstring Error,$(FPC)),)'#013#010+
-  'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+
-  'EEXT),$(SEARCHPATH)))))'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  '# fpc binary not found,',' fallback to ppc386'#013#010+
-  'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+
-  'EEXT),$(SEARCHPATH)))))'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Get a clean executable name'#013#010+
-  'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#013#010+
-  'override FPC:=$(subst \,/,$(FPC)',')$(SRCEXEEXT)'#013#010+
-  #013#010+
-  '# Try to find the binary direct first, otherwise in the path,'#013#010+
-  '# if not found give an error'#013#010+
-  'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#013#010+
-  'ifeq ($(FOUNDFPC),)'#013#010+
-  'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#013#010+
-  'ifeq',' ($(FOUNDFPC),)'#013#010+
-  '$(error Compiler $(FPC) not found)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# For 1.1 and up we can use a single compiler call to retrieve'#013#010+
-  '# all needed information'#013#010+
-  'ifndef FPC_COMPILERINFO'#013#010+
-  'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#013#010+
-  'endif'#013#010+
-  #013#010,
-  '# FPC version'#013#010+
-  'ifndef FPC_VERSION'#013#010+
-  'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'export FPC FPC_VERSION FPC_COMPILERINFO'#013#010+
-  '# CHECKDEPEND should not be exported'#013#010+
-  '# This should limit multiple checks'#013#010+
-  'unexport CHECKDEPEND ALLDEPENDENCIES',#013#010+
-  #013#010+
-  '#####################################################################'#013+
-  #010+
-  '# FPC Target Detection'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Fall back to default values if needed'#013#010+
-  'ifndef CPU_TARGET'#013#010+
-  'ifdef CP','U_TARGET_DEFAULT'#013#010+
-  'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifndef OS_TARGET'#013#010+
-  'ifdef OS_TARGET_DEFAULT'#013#010+
-  'OS_TARGET=$(OS_TARGET_DEFAULT)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# For 1.0.x we need to use extra calls to retrieve all info'#013#010+
-  'ifneq ($(words $(FPC_C','OMPILERINFO)),5)'#013#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#013#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iTP)'#013#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iSO)'#013#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iTO)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Retrieve Target/Source CPU and Target/Source OS'#013#010+
-  'if','ndef CPU_SOURCE'#013#010+
-  'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#013#010+
-  'endif'#013#010+
-  'ifndef CPU_TARGET'#013#010+
-  'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#013#010+
-  'endif'#013#010+
-  'ifndef OS_SOURCE'#013#010+
-  'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#013#010+
-  'endif'#013#010+
-  'ifndef OS_TARGET'#013#010+
-  'OS_TARGET:=$(word 5',',$(FPC_COMPILERINFO))'#013#010+
-  'endif'#013#010+
-  'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#013#010+
-  'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#013#010+
-  #013#010+
-  '# Full name of the target, including CPU and OS. For OSs limited'#013#010+
-  '# to 8.3 we only use the target OS'#013#010+
-  'ifneq ($(findstring $(OS_S','OURCE),$(LIMIT83fs)),)'#013#010+
-  'TARGETSUFFIX=$(OS_TARGET)'#013#010+
-  'SOURCESUFFIX=$(OS_SOURCE)'#013#010+
-  'else'#013#010+
-  'TARGETSUFFIX=$(FULL_TARGET)'#013#010+
-  'SOURCESUFFIX=$(FULL_SOURCE)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Cross compile flag'#013#010+
-  'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#013#010+
-  'CROSSCOMPILE=1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# C','heck if the Makefile supports this target, but not'#013#010+
-  '# when the make target is to rebuild the makefile'#013#010+
-  'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#013#010+
-  'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#013#010+
-  '$(error The Makefile doesn'#039't sup','port target $(FULL_TARGET), plea'+
-  'se run fpcmake first)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+
-  #013#010+
-  'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#013#010+
-  'BSDhier=1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Detect Linux, will also use ','its own directory hierarchy.'#013#010+
-  'ifeq ($(OS_TARGET),linux)'#013#010+
-  'linuxHier=1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOUR'+
-  'CE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#013#010+
-  #013#010+
-  #013#010+
-  '[fpcdircheckenv]'#013#010+
-  '##########################','##########################################'+
-  '#'#013#010+
-  '# FPCDIR Setting'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Test FPCDIR to look if the RTL dir exists'#013#010+
-  'ifdef FPCDIR'#013#010+
-  'override FPCDIR:=$(subst \,/,$(FPCDIR))'#013#010+
-  'ifeq',' ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
-  'override FPCDIR=wrong'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'override FPCDIR=wrong'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Default FPCDIR from Makefile.fpc'#013#010+
-  'ifdef DEFAULT_FPCDIR'#013#010+
-  'ifeq ($(FPCDIR),wrong)'#013#010+
-  'override FPCDIR:=$(subst \,/,$(DEFAULT_','FPCDIR))'#013#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
-  'override FPCDIR=wrong'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '[fpcdirdetect]'#013#010+
-  '# Detect FPCDIR'#013#010+
-  'ifeq ($(FPCDIR),wrong)'#013#010+
-  'ifdef inUnix'#013#010+
-  'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#013#010+
-  'ifeq ($','(wildcard $(FPCDIR)/units),)'#013#010+
-  'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+
-  'suffix /$(FPC),$(SEARCHPATH))))))'#013#010+
-  'override FPCDIR:=$(FPCDIR)/..'#013#010+
-  'ifeq ($(wildcard',' $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
-  'override FPCDIR:=$(FPCDIR)/..'#013#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
-  'override FPCDIR:=$(BASEDIR)'#013#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
-  'override FPCDIR=c:/pp'#013#010+
-  'endif'#013#010+
-  'e','ndif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Cross binaries dir'#013#010+
-  'ifndef CROSSBINDIR'#013#010+
-  'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Default binutils prefix for cross compile when the'#013#010+
-  '# crossbindir is not set'#013#010+
-  'ifndef BINUTILSPREFIX'#013#010+
-  'i','fndef CROSSBINDIR'#013#010+
-  'ifdef CROSSCOMPILE'#013#010+
-  'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Try first the full target name, otherwise try only'#013#010+
-  '# the OS for backwards compatibility'#013#010+
-  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TAR','GETSUFFIX))'#013#010+
-  'ifeq ($(UNITSDIR),)'#013#010+
-  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Packages dir'#013#010+
-  'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/pa'+
-  'ckages/extra)'#013#010+
-  #013#010+
-  #013#010+
-  '[shelltools]'#013#010+
-  '##########################','##########################################'+
-  '#'#013#010+
-  '# Shell tools'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Echo that can redir (must be able run in the default OS shell)'#013#010+
-  'ifndef ECHOREDIR'#013#010+
-  'ifndef inUnix'#013#010+
-  'ECHOREDI','R=echo'#013#010+
-  'else'#013#010+
-  'ECHOREDIR=$(ECHO)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# To copy pograms'#013#010+
-  'ifndef COPY'#013#010+
-  'COPY:=$(CPPROG) -fp'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Copy a whole tree'#013#010+
-  'ifndef COPYTREE'#013#010+
-  'COPYTREE:=$(CPPROG) -Rfp'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Copy a whole tree'#013#010+
-  'ifndef MKDIRTREE'#013#010+
-  'MKDIRTREE:=$(MKDI','RPROG) -p'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# To move pograms'#013#010+
-  'ifndef MOVE'#013#010+
-  'MOVE:=$(MVPROG) -f'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Check delete program'#013#010+
-  'ifndef DEL'#013#010+
-  'DEL:=$(RMPROG) -f'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Check deltree program'#013#010+
-  'ifndef DELTREE'#013#010+
-  'DELTREE:=$(RMPROG) -rf'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# To install files'#013#010+
-  'i','fndef INSTALL'#013#010+
-  'ifdef inUnix'#013#010+
-  'INSTALL:=$(GINSTALL) -c -m 644'#013#010+
-  'else'#013#010+
-  'INSTALL:=$(COPY)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# To install programs'#013#010+
-  'ifndef INSTALLEXE'#013#010+
-  'ifdef inUnix'#013#010+
-  'INSTALLEXE:=$(GINSTALL) -c -m 755'#013#010+
-  'else'#013#010+
-  'INSTALLEXE:=$(COPY)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# To ','make a directory.'#013#010+
-  'ifndef MKDIR'#013#010+
-  'MKDIR:=$(GINSTALL) -m 755 -d'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKD'+
-  'IR'#013#010+
-  #013#010+
-  #013#010+
-  '[defaultdirs]'#013#010+
-  '#####################################################################'#013+
-  #010+
-  '# De','fault Directories'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Units dir'#013#010+
-  'ifdef REQUIRE_UNITSDIR'#013#010+
-  'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Units dir'#013#010+
-  'ifdef REQUIRE_PACKAGESDIR'#013#010+
-  'override PACKAGESDIR+=','$(REQUIRE_PACKAGESDIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '# Unixes use unix dirs with /usr/bin, /usr/lib'#013#010+
-  '# When zipping use the target os default, when normal install then'#013+
-  #010+
-  '# use the source os as default'#013#010+
-  'ifdef ZIPINSTALL'#013#010+
-  '# Zipinstall'#013#010+
-  'ifneq ($(findstring $(OS_','TARGET),$(UNIXs)),)'#013#010+
-  'UNIXHier=1'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  '# Normal install'#013#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#013#010+
-  'UNIXHier=1'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# When install prefix is not set try to use prefix'#013#010+
-  'ifndef INSTALL_PREFIX'#013#010+
-  'ifdef PREFIX'#013#010+
-  'INSTALL_PREFI','X=$(PREFIX)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# set the prefix directory where to install everything'#013#010+
-  'ifndef INSTALL_PREFIX'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'INSTALL_PREFIX=/usr/local'#013#010+
-  'else'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'INSTALL_BASEDIR:=/pp'#013#010+
-  'else'#013#010+
-  'INSTALL_BASEDIR:=/$(PACKAGE_N','AME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'export INSTALL_PREFIX'#013#010+
-  #013#010+
-  '# Export also INSTALL_SOURCESUBDIR set so it will be'#013#010+
-  '# used recursively for all subdirs'#013#010+
-  'ifdef INSTALL_FPCSUBDIR'#013#010+
-  'export INSTALL_FPCSUBDIR'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where to place the resulting zip fil','es'#013#010+
-  'ifndef DIST_DESTDIR'#013#010+
-  'DIST_DESTDIR:=$(BASEDIR)'#013#010+
-  'endif'#013#010+
-  'export DIST_DESTDIR'#013#010+
-  #013#010+
-  '# EXE/PPU Target directories'#013#010+
-  'ifndef COMPILER_UNITTARGETDIR'#013#010+
-  'ifdef PACKAGEDIR_MAIN'#013#010+
-  'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#013#010+
-  'else'#013#010+
-  'COMP','ILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifndef COMPILER_TARGETDIR'#013#010+
-  'COMPILER_TARGETDIR=.'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '#####################################################################'#013+
-  #010+
-  '# Install Directories'#013#010+
-  '##############################','######################################'+
-  '#'#013#010+
-  #013#010+
-  '# set the base directory where to install everything'#013#010+
-  'ifndef INSTALL_BASEDIR'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#013#010+
-  'else'#013#010+
-  'INSTALL_BASE','DIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# set the directory where to install the binaries'#013#010+
-  'ifndef INSTALL_BINDIR'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#013#010+
-  'el','se'#013#010+
-  'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#013#010+
-  '# for FPC packages install the binaries under their target subdir'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'ifdef CROSSCOMPILE'#013#010+
-  'ifdef CROSSINSTALL'#013#010+
-  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#013#010+
-  'else'#013#010+
-  'INSTAL','L_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# set the directory where to install the units.'#013#010+
-  'ifndef INSTALL_UNITDIR'#013#010+
-  'INSTALL_UNITDIR:=$(INSTALL_B','ASEDIR)/units/$(TARGETSUFFIX)'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'ifdef PACKAGE_NAME'#013#010+
-  'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where to install shared libraries'#013#010+
-  'ifndef INSTALL_LIBDIR'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'INSTALL_LIB','DIR:=$(INSTALL_PREFIX)/lib'#013#010+
-  'else'#013#010+
-  'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where the source files will be stored'#013#010+
-  'ifndef INSTALL_SOURCEDIR'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'ifdef BSDhier'#013#010+
-  'SRCPREFIXDIR=share/src'#013#010+
-  'else'#013#010+
-  'ifdef linuxHier'#013#010+
-  'SRCPREFIX','DIR=share/src'#013#010+
-  'else'#013#010+
-  'SRCPREFIXDIR=src'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'ifdef INSTALL_FPCSUBDIR'#013#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
-  ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#013#010+
-  'else'#013#010+
-  'INSTALL_SOURCEDIR:=$','(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+
-  'ON)/$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+
-  '(PACKAGE_VERSION)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'ifdef INSTALL_FPCSUBDIR'#013#010+
-  'INSTA','LL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$('+
-  'PACKAGE_NAME)'#013#010+
-  'else'#013#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where the ','doc files will be stored'#013#010+
-  'ifndef INSTALL_DOCDIR'#013#010+
-  'ifdef UNIXHier'#013#010+
-  'ifdef BSDhier'#013#010+
-  'DOCPREFIXDIR=share/doc'#013#010+
-  'else'#013#010+
-  'ifdef linuxHier'#013#010+
-  'DOCPREFIXDIR=share/doc'#013#010+
-  'else'#013#010+
-  'DOCPREFIXDIR=doc'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'INSTALL_DOCDIR:=$(INSTALL','_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)'+
-  '/$(PACKAGE_NAME)'#013#010+
-  'else'#013#010+
-  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+
-  'CKAGE_VERSION)'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE','_NAME)'#013#010+
-  'else'#013#010+
-  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where to install the examples, under linux we use the doc dir'#013#010+
-  '# because the copytree command will create a subdir itself'#013#010+
-  'ifndef INSTALL_EXAMPLEDIR'#013#010+
-  'ifdef UNIXH','ier'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  #013#010+
-  'ifdef BSDhier'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+
-  ')/$(PACKAGE_NAME)'#013#010+
-  'else'#013#010+
-  'ifdef linuxHier'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#013#010+
-  'else'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INST','ALL_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+
-  's/$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'else'#013#010+
-  #013#010+
-  'ifdef BSDhier'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+
-  '(PACKAGE_VERSION)'#013#010+
-  'else'#013#010+
-  'ifdef linuxHier'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTAL','L_DOCDIR)/examples/$(PACKAGE_NAME)-$(PAC'+
-  'KAGE_VERSION)'#013#010+
-  'else'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+
-  'RSION)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ifdef INSTALL_FPCPACKAGE'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/example','s/$(PACKAGE_NAME)'#013#010+
-  'else'#013#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Where the some extra (data)files will be stored'#013#010+
-  'ifndef INSTALL_DATADIR'#013#010+
-  'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '#######################','#############################################'+
-  '#'#013#010+
-  '# Cross compile dirs'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  'ifdef CROSSCOMPILE'#013#010+
-  '# Directory where the cross compile tools are stored.'#013#010+
-  '# First check if they ','are available in FPCDIR. If no targets/ subdir'+
-  #013#010+
-  '# is found use the targets/ subdir in INSTALL_BASEDIR.'#013#010+
-  'ifndef CROSSBINDIR'#013#010+
-  'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#013#010+
-  'ifeq ($(CROSSBINDIR),)'#013#010+
-  'CROSSBINDIR:=$(wildcard $(IN','STALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin'+
-  '/$(FULL_SOURCE))'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'CROSSBINDIR='#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[dirlibc]'#013#010+
-  '# On linux, try to find where libgcc.a is.'#013#010+
-  'ifeq ($(OS_SOURCE),linux)'#013#010+
-  #013#010+
-  '# Amd64 to i386?'#013#010+
-  'ifndef GCCLIBDIR'#013#010+
-  'ifeq ($(CPU_TARGE','T),i386)'#013#010+
-  'ifneq ($(findstring x86_64,$(shell uname -a)),)'#013#010+
-  'ifeq ($(BINUTILSPREFIX),)'#013#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Try cross gcc'#013#010+
-  'ifndef GCCLIBDIR'#013#010+
-  'CROSSGCC=$(strip $(wildca','rd $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+
-  'EEXT),$(SEARCHPATH))))'#013#010+
-  'ifneq ($(CROSSGCC),)'#013#010+
-  'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Other libraries from ld.so.conf'#013#010+
-  'ifndef OTHERLIBDIR'#013#010+
-  'OTHERLIBDIR:=','$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
-  '" "; print $1 }'#039')'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef inUnix'#013#010+
-  'ifeq ($(OS_SOURCE),netbsd)'#013#010+
-  'OTHERLIBDIR+=/usr/pkg/lib'#013#010+
-  'endif'#013#010+
-  'export GCCLIBDIR OTHERLIB'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[extensions]'#013#010+
-  '##########################','##########################################'+
-  '#'#013#010+
-  '# Default extensions'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Default needed extensions (Go32v2,Linux)'#013#010+
-  'BATCHEXT=.bat'#013#010+
-  'LOADEREXT=.as'#013#010+
-  'EXEEXT=.exe'#013#010+
-  'PPLEXT=.ppl'#013#010,
-  'PPUEXT=.ppu'#013#010+
-  'OEXT=.o'#013#010+
-  'ASMEXT=.s'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'SHAREDLIBEXT=.so'#013#010+
-  'STATICLIBPREFIX=libp'#013#010+
-  'RSTEXT=.rst'#013#010+
-  '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
-  ' has this'#013#010+
-  #013#010+
-  '# 1.0.x has target specific extensions f','or ppu files and objects'#013+
-  #010+
-  'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#013#010+
-  '# short version for 1.1 and above - no target specific extensions'#013#010+
-  #013#010+
-  '# Go32v1'#013#010+
-  'ifeq ($(OS_TARGET),go32v1)'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=v1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Go32v2'#013#010+
-  'ifeq ($(OS_','TARGET),go32v2)'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=dos'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# watcom'#013#010+
-  'ifeq ($(OS_TARGET),watcom)'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'OEXT=.obj'#013#010+
-  'ASMEXT=.asm'#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=wat'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Linux'#013#010+
-  'ifeq ($(OS_TARGET),linux)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEE','XT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=lnx'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# FreeBSD'#013#010+
-  'ifeq ($(OS_TARGET),freebsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=fbs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# NetBSD'#013#010+
-  'ifeq ($(OS_TARGET),netbsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX','=nbs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# OpenBSD'#013#010+
-  'ifeq ($(OS_TARGET),openbsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=obs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Win32'#013#010+
-  'ifeq ($(OS_TARGET),win32)'#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=w32'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# OS/2'#013#010+
-  'ifeq ($(OS_TARGET),os2)'#013#010+
-  'BATCHE','XT=.cmd'#013#010+
-  'AOUTEXT=.out'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=os2'#013#010+
-  'ECHO=echo'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# EMX'#013#010+
-  'ifeq ($(OS_TARGET),emx)'#013#010+
-  'BATCHEXT=.cmd'#013#010+
-  'AOUTEXT=.out'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=emx'#013#010+
-  'ECHO=echo'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Amiga'#013,#010+
-  'ifeq ($(OS_TARGET),amiga)'#013#010+
-  'EXEEXT='#013#010+
-  'SHAREDLIBEXT=.library'#013#010+
-  'SHORTSUFFIX=amg'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# MorphOS'#013#010+
-  'ifeq ($(OS_TARGET),morphos)'#013#010+
-  'EXEEXT='#013#010+
-  'SHAREDLIBEXT=.library'#013#010+
-  'SHORTSUFFIX=mos'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Atari'#013#010+
-  'ifeq ($(OS_TARGET),atari)'#013#010+
-  'EXEEXT=.ttp'#013#010+
-  'SHORTSU','FFIX=ata'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# BeOS'#013#010+
-  'ifeq ($(OS_TARGET),beos)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'SHORTSUFFIX=be'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Solaris'#013#010+
-  'ifeq ($(OS_TARGET),solaris)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'SHORTSUFFIX=sun'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# QNX'#013#010+
-  'ifeq ($(OS_TARGET),qnx)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEE','XT='#013#010+
-  'SHORTSUFFIX=qnx'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Netware clib'#013#010+
-  'ifeq ($(OS_TARGET),netware)'#013#010+
-  'EXEEXT=.nlm'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=nw'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Netware libc'#013#010+
-  'ifeq ($(OS_TARGET),netwlibc)'#013#010+
-  'EXEEXT=.nlm'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=nwl'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Mac','OS'#013#010+
-  'ifeq ($(OS_TARGET),macos)'#013#010+
-  'BATCHEXT='#013#010+
-  'EXEEXT='#013#010+
-  'DEBUGSYMEXT=.xcoff'#013#010+
-  'SHORTSUFFIX=mac'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Darwin'#013#010+
-  'ifeq ($(OS_TARGET),darwin)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=dwn'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'else'#013#010+
-  '# long version for 1.0.x - target ','specific extensions'#013#010+
-  #013#010+
-  '# Go32v1'#013#010+
-  'ifeq ($(OS_TARGET),go32v1)'#013#010+
-  'PPUEXT=.pp1'#013#010+
-  'OEXT=.o1'#013#010+
-  'ASMEXT=.s1'#013#010+
-  'SMARTEXT=.sl1'#013#010+
-  'STATICLIBEXT=.a1'#013#010+
-  'SHAREDLIBEXT=.so1'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=v1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Go32v2'#013#010+
-  'ifeq ($(OS_TARGET),go32v2)'#013#010+
-  'STATICLIBPR','EFIX='#013#010+
-  'SHORTSUFFIX=dos'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# watcom'#013#010+
-  'ifeq ($(OS_TARGET),watcom)'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'SHORTSUFFIX=wat'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Linux'#013#010+
-  'ifeq ($(OS_TARGET),linux)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=lnx'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# FreeBSD'#013#010+
-  'ifeq ($(OS_TA','RGET),freebsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=fbs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# NetBSD'#013#010+
-  'ifeq ($(OS_TARGET),netbsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EXEEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=nbs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# OpenBSD'#013#010+
-  'ifeq ($(OS_TARGET),openbsd)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'EX','EEXT='#013#010+
-  'HASSHAREDLIB=1'#013#010+
-  'SHORTSUFFIX=obs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Win32'#013#010+
-  'ifeq ($(OS_TARGET),win32)'#013#010+
-  'PPUEXT=.ppw'#013#010+
-  'OEXT=.ow'#013#010+
-  'ASMEXT=.sw'#013#010+
-  'SMARTEXT=.slw'#013#010+
-  'STATICLIBEXT=.aw'#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=w32'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# OS/2'#013#010+
-  'ifeq ($(OS_TARGET),os2)'#013#010+
-  'BATCHEXT=','.cmd'#013#010+
-  'PPUEXT=.ppo'#013#010+
-  'ASMEXT=.so2'#013#010+
-  'OEXT=.oo2'#013#010+
-  'AOUTEXT=.out'#013#010+
-  'SMARTEXT=.sl2'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'STATICLIBEXT=.ao2'#013#010+
-  'SHAREDLIBEXT=.dll'#013#010+
-  'SHORTSUFFIX=os2'#013#010+
-  'ECHO=echo'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Amiga'#013#010+
-  'ifeq ($(OS_TARGET),amiga)'#013#010+
-  'EXEEXT='#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.asm'#013#010+
-  'OEXT','=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'SHAREDLIBEXT=.library'#013#010+
-  'SHORTSUFFIX=amg'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Atari'#013#010+
-  'ifeq ($(OS_TARGET),atari)'#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.s'#013#010+
-  'OEXT=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'EXEEXT=.ttp'#013#010+
-  'SHORTSUFFIX=ata'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# BeOS'#013#010+
-  'ifeq ($(','OS_TARGET),beos)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.s'#013#010+
-  'OEXT=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'EXEEXT='#013#010+
-  'SHORTSUFFIX=be'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Solaris'#013#010+
-  'ifeq ($(OS_TARGET),solaris)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.s'#013#010+
-  'OEXT=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIB','EXT=.a'#013#010+
-  'EXEEXT='#013#010+
-  'SHORTSUFFIX=sun'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# QNX'#013#010+
-  'ifeq ($(OS_TARGET),qnx)'#013#010+
-  'BATCHEXT=.sh'#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.s'#013#010+
-  'OEXT=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'EXEEXT='#013#010+
-  'SHORTSUFFIX=qnx'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Netware'#013#010+
-  'ifeq ($(OS_TARGET),netware)'#013#010+
-  'STATICLIBPRE','FIX='#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'OEXT=.o'#013#010+
-  'ASMEXT=.s'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'SHAREDLIBEXT=.nlm'#013#010+
-  'EXEEXT=.nlm'#013#010+
-  'SHORTSUFFIX=nw'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Netware libc'#013#010+
-  'ifeq ($(OS_TARGET),netwlibc)'#013#010+
-  'STATICLIBPREFIX='#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'OEXT=.o'#013#010+
-  'ASMEXT=.s'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'ST','ATICLIBEXT=.a'#013#010+
-  'SHAREDLIBEXT=.nlm'#013#010+
-  'EXEEXT=.nlm'#013#010+
-  'SHORTSUFFIX=nwl'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# MacOS'#013#010+
-  'ifeq ($(OS_TARGET),macos)'#013#010+
-  'BATCHEXT='#013#010+
-  'PPUEXT=.ppu'#013#010+
-  'ASMEXT=.s'#013#010+
-  'OEXT=.o'#013#010+
-  'SMARTEXT=.sl'#013#010+
-  'STATICLIBEXT=.a'#013#010+
-  'EXEEXT='#013#010+
-  'DEBUGSYMEXT=.xcoff'#013#010+
-  'SHORTSUFFIX=mac'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '#','end of target specific settings'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# For 8.3 limited OS'#039's the short suffixes'#013#010+
-  '# Otherwise use the full source/target names'#013#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#013#010+
-  'FPCMADE=fpcmade.$(SHORTSUFFIX)'#013#010+
-  'ZIPSUFFIX=$(SHORTSUFFIX)'#013#010+
-  'Z','IPCROSSPREFIX='#013#010+
-  'ZIPSOURCESUFFIX=src'#013#010+
-  'ZIPEXAMPLESUFFIX=exm'#013#010+
-  'else'#013#010+
-  'FPCMADE=fpcmade.$(TARGETSUFFIX)'#013#010+
-  'ZIPSOURCESUFFIX=.source'#013#010+
-  'ZIPEXAMPLESUFFIX=.examples'#013#010+
-  'ifdef CROSSCOMPILE'#013#010+
-  'ZIPSUFFIX=.$(SOURCESUFFIX)'#013#010+
-  'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#013#010+
-  'else'#013#010+
-  'ZI','PSUFFIX=.$(TARGETSUFFIX)'#013#010+
-  'ZIPCROSSPREFIX='#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '[defaulttools]'#013#010+
-  '#####################################################################'#013+
-  #010+
-  '# Default Tools'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '# Na','mes of the binutils tools'#013#010+
-  'ASNAME=$(BINUTILSPREFIX)as'#013#010+
-  'LDNAME=$(BINUTILSPREFIX)ld'#013#010+
-  'ARNAME=$(BINUTILSPREFIX)ar'#013#010+
-  'RCNAME=$(BINUTILSPREFIX)rc'#013#010+
-  'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#013#010+
-  'ifeq ($(OS_TARGET),win32)'#013#010+
-  'ifeq ($(CROSSBINDIR),)'#013#010+
-  'ASNAME','=asw'#013#010+
-  'LDNAME=ldw'#013#010+
-  'ARNAME=arw'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# assembler, redefine it if cross compiling'#013#010+
-  'ifndef ASPROG'#013#010+
-  'ifdef CROSSBINDIR'#013#010+
-  'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#013#010+
-  'else'#013#010+
-  'ASPROG=$(ASNAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# linker, but probably ','not used'#013#010+
-  'ifndef LDPROG'#013#010+
-  'ifdef CROSSBINDIR'#013#010+
-  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#013#010+
-  'else'#013#010+
-  'LDPROG=$(LDNAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Resource compiler'#013#010+
-  'ifndef RCPROG'#013#010+
-  'ifdef CROSSBINDIR'#013#010+
-  'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#013#010+
-  'else'#013#010+
-  'RCPRO','G=$(RCNAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Archiver'#013#010+
-  'ifndef ARPROG'#013#010+
-  'ifdef CROSSBINDIR'#013#010+
-  'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#013#010+
-  'else'#013#010+
-  'ARPROG=$(ARNAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Override defaults'#013#010+
-  'AS=$(ASPROG)'#013#010+
-  'LD=$(LDPROG)'#013#010+
-  'RC=$(RCPROG)'#013#010+
-  'AR=$(ARPROG)'#013#010+
-  #013#010+
-  '#',' ppas.bat / ppas.sh'#013#010+
-  'PPAS=ppas$(SRCBATCHEXT)'#013#010+
-  #013#010+
-  '# ldconfig to rebuild .so cache'#013#010+
-  'ifdef inUnix'#013#010+
-  'LDCONFIG=ldconfig'#013#010+
-  'else'#013#010+
-  'LDCONFIG='#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef DATE'#013#010+
-  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#013#010+
-  'else'#013#010+
-  'DATESTR='#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Look if UPX is found for g','o32v2 and win32. We can'#039't use $UPX b'+
-  'ecuase'#013#010+
-  '# upx uses that one itself (PFV)'#013#010+
-  'ifndef UPXPROG'#013#010+
-  'ifeq ($(OS_TARGET),go32v2)'#013#010+
-  'UPXPROG:=1'#013#010+
-  'endif'#013#010+
-  'ifeq ($(OS_TARGET),win32)'#013#010+
-  'UPXPROG:=1'#013#010+
-  'endif'#013#010+
-  'ifdef UPXPROG'#013#010+
-  'UPXPROG:=$(strip $(wildcard $(addsuffi','x /upx$(SRCEXEEXT),$(SEARCHPAT'+
-  'H))))'#013#010+
-  'ifeq ($(UPXPROG),)'#013#010+
-  'UPXPROG='#013#010+
-  'else'#013#010+
-  'UPXPROG:=$(firstword $(UPXPROG))'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'UPXPROG='#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'export UPXPROG'#013#010+
-  #013#010+
-  '# Zip options'#013#010+
-  'ZIPOPT=-9'#013#010+
-  'ZIPEXT=.zip'#013#010+
-  #013#010+
-  '# Tar options'#013#010+
-  'ifeq ($(USETAR),bz2)'#013#010,
-  'TAROPT=vj'#013#010+
-  'TAREXT=.tar.bz2'#013#010+
-  'else'#013#010+
-  'TAROPT=vz'#013#010+
-  'TAREXT=.tar.gz'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[command_begin]'#013#010+
-  '#####################################################################'#013+
-  #010+
-  '# Compiler Command Line'#013#010+
+  '[fpcdetect]'#010+
+  '#####################################################################'#010+
+  '# FPC Binary and Version Detection'#010+
   '#######################################################','#############'+
-  '#'#013#010+
-  #013#010+
-  '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#013+
+  '#'#010+
   #010+
-  '# compiler this needs to be turned off'#013#010+
-  'ifndef NOCPUDEF'#013#010+
-  'override FPCOPTDEF=$(CPU_TARGET)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '# Load commandline OPT and add target and unit dir ','to be sure'#013#010+
-  'ifneq ($(OS_TARGET),$(OS_SOURCE))'#013#010+
-  'override FPCOPT+=-T$(OS_TARGET)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifeq ($(OS_SOURCE),openbsd)'#013#010+
-  'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifndef CROSSBOOTSTRAP'#013#010+
-  'ifneq ($(BINUTILSPREFIX),)'#013#010+
-  'override FPCOPT+=-XP','$(BINUTILSPREFIX) -Xc'#013#010+
-  'endif'#013#010+
-  'ifneq ($(BINUTILSPREFIX),)'#013#010+
-  'override FPCOPT+=-Xr$(RLINKPATH)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# User dirs should be first, so they are looked at first'#013#010+
-  'ifdef UNITDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef ','LIBDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef OBJDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef INCDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Smartlinking'#013#010+
-  'ifdef LINKSMART'#013#010+
-  'override FPCO','PT+=-XX'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Smartlinking creation'#013#010+
-  'ifdef CREATESMART'#013#010+
-  'override FPCOPT+=-CX'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Debug'#013#010+
-  'ifdef DEBUG'#013#010+
-  'override FPCOPT+=-gl'#013#010+
-  'override FPCOPTDEF+=DEBUG'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Release mode (strip, optimize and don'#039't load fpc.cfg)'#013#010+
-  'ifdef RELE','ASE'#013#010+
-  'ifeq ($(CPU_TARGET),i386)'#013#010+
-  'FPCCPUOPT:=-OG2p3'#013#010+
-  'else'#013#010+
-  'ifeq ($(CPU_TARGET),powerpc)'#013#010+
-  'FPCCPUOPT:=-O1'#013#010+
-  'else'#013#010+
-  'FPCCPUOPT:='#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#013#010+
-  'override FPCOPTDEF+=RELEASE'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Strip'#013#010+
-  'ifdef STRIP'#013#010+
-  'ov','erride FPCOPT+=-Xs'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Optimizer (i386 only for now)'#013#010+
-  'ifdef OPTIMIZE'#013#010+
-  'ifeq ($(CPU_TARGET),i386)'#013#010+
-  'override FPCOPT+=-OG2p3'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Verbose settings (warning,note,info)'#013#010+
-  'ifdef VERBOSE'#013#010+
-  'override FPCOPT+=-vwni'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Need','ed compiler options'#013#010+
-  'ifdef COMPILER_OPTIONS'#013#010+
-  'override FPCOPT+=$(COMPILER_OPTIONS)'#013#010+
-  'endif'#013#010+
-  'ifdef COMPILER_UNITDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef COMPILER_LIBRARYDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fl,$(CO','MPILER_LIBRARYDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef COMPILER_OBJECTDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#013#010+
-  'endif'#013#010+
-  'ifdef COMPILER_INCLUDEDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Cross compiler utils'#013#010+
-  'ifde','f CROSSBINDIR'#013#010+
-  'override FPCOPT+=-FD$(CROSSBINDIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Target dirs and the prefix to use for clean/install'#013#010+
-  'ifdef COMPILER_TARGETDIR'#013#010+
-  'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#013#010+
-  'ifeq ($(COMPILER_TARGETDIR),.)'#013#010+
-  'override TARGETDIRPREFIX','='#013#010+
-  'else'#013#010+
-  'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Unit target dir (default is units/<cpu>-<os>/'#013#010+
-  'ifdef COMPILER_UNITTARGETDIR'#013#010+
-  'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#013#010+
-  'ifeq ($(COMPILER_UNITTARGETDIR),.)'#013#010+
-  'over','ride UNITTARGETDIRPREFIX='#013#010+
-  'else'#013#010+
-  'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'ifdef COMPILER_TARGETDIR'#013#010+
-  'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#013#010+
-  'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#013#010+
-  'endif'#013#010,
-  'endif'#013#010+
-  #013#010+
-  '# Temporary hack to add HASUNIX define for linux 1.0.6 compiler'#013#010+
-  'ifeq ($(OS_TARGET),linux)'#013#010+
-  'ifeq ($(FPC_VERSION),1.0.6)'#013#010+
-  'override FPCOPTDEF+=HASUNIX'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '[command_libc]'#013#010+
-  '# Add GCC lib path if asked'#013#010+
-  'ifdef GCCLIBDIR'#013#010+
-  'ove','rride FPCOPT+=-Fl$(GCCLIBDIR)'#013#010+
-  'endif'#013#010+
-  'ifdef OTHERLIBDIR'#013#010+
-  'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[command_end]'#013#010+
-  '# Add commandline options last so they can override'#013#010+
-  'ifdef OPT'#013#010+
-  'override FPCOPT+=$(OPT)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Add def','ines from FPCOPTDEF to FPCOPT'#013#010+
-  'ifdef FPCOPTDEF'#013#010+
-  'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Was a config file specified ?'#013#010+
-  'ifdef CFGFILE'#013#010+
-  'override FPCOPT+=@$(CFGFILE)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Use the environment to pass commandline options','?'#013#010+
-  'ifdef USEENV'#013#010+
-  'override FPCEXTCMD:=$(FPCOPT)'#013#010+
-  'override FPCOPT:=!FPCEXTCMD'#013#010+
-  'export FPCEXTCMD'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Compiler commandline'#013#010+
-  'override COMPILER:=$(FPC) $(FPCOPT)'#013#010+
-  #013#010+
-  '# also call ppas if with command option -s'#013#010+
-  '# but only if the FULL_SOURCE',' and FULL_TARGET are equal'#013#010+
-  'ifeq (,$(findstring -s ,$(COMPILER)))'#013#010+
-  'EXECPPAS='#013#010+
-  'else'#013#010+
-  'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#013#010+
-  'EXECPPAS:=@$(PPAS)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[loaderrules]'#013#010+
+  '# Compatibility with old makefiles'#010+
+  'ifndef FPC'#010+
+  'ifdef PP'#010+
+  'FPC=$(PP)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+
+  '# to query for the default ppcXXX the fpc executable tries. When'#010+
+  '# fpc is not fou','nd use ppc386 by default. Also when fpc -PB gives'#010+
+  '# an error ppc386 will be used.'#010+
+  'ifndef FPC'#010+
+  '# check if fpc exists'#010+
+  'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+
+  ')))'#010+
+  'ifneq ($(FPCPROG),)'#010+
+  'FPCPROG:=$(firstword $(FPCPROG)',')'#010+
+  'FPC:=$(shell $(FPCPROG) -PB)'#010+
+  '# Older fpc executables didn'#039't support it and return'#010+
+  '# Error: Illegal processor... If found then fallback to ppc386'#010+
+  'ifneq ($(findstring Error,$(FPC)),)'#010+
+  'override FPC=$(firstword $(strip $(wildcard $(addsuffix /','ppc386$(SRC'+
+  'EXEEXT),$(SEARCHPATH)))))'#010+
+  'endif'#010+
+  'else'#010+
+  '# fpc binary not found, fallback to ppc386'#010+
+  'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+
+  'EEXT),$(SEARCHPATH)))))'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Get a clean executable name'#010+
+  'override FPC',':=$(subst $(SRCEXEEXT),,$(FPC))'#010+
+  'override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)'#010+
+  #010+
+  '# Try to find the binary direct first, otherwise in the path,'#010+
+  '# if not found give an error'#010+
+  'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#010+
+  'ifeq ($(FOUNDFPC),)'#010+
+  'FOUNDFPC=$(s','trip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#010+
+  'ifeq ($(FOUNDFPC),)'#010+
+  '$(error Compiler $(FPC) not found)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# For 1.1 and up we can use a single compiler call to retrieve'#010+
+  '# all needed information'#010+
+  'ifndef FPC_COMPILERINFO'#010+
+  'FPC_COM','PILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+
+  'endif'#010+
+  #010+
+  '# FPC version'#010+
+  'ifndef FPC_VERSION'#010+
+  'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#010+
+  'endif'#010+
+  #010+
+  'export FPC FPC_VERSION FPC_COMPILERINFO'#010+
+  '# CHECKDEPEND should not be exported'#010+
+  '# This should limit multiple check','s'#010+
+  'unexport CHECKDEPEND ALLDEPENDENCIES'#010+
+  #010+
+  '#####################################################################'#010+
+  '# FPC Target Detection'#010+
+  '#####################################################################'#010+
+  #010+
+  '# Fall back to default values if nee','ded'#010+
+  'ifndef CPU_TARGET'#010+
+  'ifdef CPU_TARGET_DEFAULT'#010+
+  'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifndef OS_TARGET'#010+
+  'ifdef OS_TARGET_DEFAULT'#010+
+  'OS_TARGET=$(OS_TARGET_DEFAULT)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# For 1.0.x we need to use extra calls to retrieve all info'#010+
+  'ifn','eq ($(words $(FPC_COMPILERINFO)),5)'#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iTP)'#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iSO)'#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iTO)'#010+
+  'endif'#010+
+  #010+
+  '# Retrieve Target/Source CPU and Target/S','ource OS'#010+
+  'ifndef CPU_SOURCE'#010+
+  'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+
+  'endif'#010+
+  'ifndef CPU_TARGET'#010+
+  'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#010+
+  'endif'#010+
+  'ifndef OS_SOURCE'#010+
+  'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#010+
+  'endif'#010+
+  'ifndef OS_TARGET'#010+
+  'OS_TARGET:=$(word ','5,$(FPC_COMPILERINFO))'#010+
+  'endif'#010+
+  'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
+  'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
+  #010+
+  '# Full name of the target, including CPU and OS. For OSs limited'#010+
+  '# to 8.3 we only use the target OS'#010+
+  'ifneq ($(findstring $(OS_SOURCE)',',$(LIMIT83fs)),)'#010+
+  'TARGETSUFFIX=$(OS_TARGET)'#010+
+  'SOURCESUFFIX=$(OS_SOURCE)'#010+
+  'else'#010+
+  'TARGETSUFFIX=$(FULL_TARGET)'#010+
+  'SOURCESUFFIX=$(FULL_SOURCE)'#010+
+  'endif'#010+
+  #010+
+  '# Cross compile flag'#010+
+  'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#010+
+  'CROSSCOMPILE=1'#010+
+  'endif'#010+
+  #010+
+  '# Check if the Makefil','e supports this target, but not'#010+
+  '# when the make target is to rebuild the makefile'#010+
+  'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+
+  'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+
+  '$(error The Makefile doesn'#039't support target $(FULL_TARG','ET), plea'+
+  'se run fpcmake first)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+
+  #010+
+  'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#010+
+  'BSDhier=1'#010+
+  'endif'#010+
+  #010+
+  '# Detect Linux, will also use its own directory hierarchy.'#010+
+  'ifeq',' ($(OS_TARGET),linux)'#010+
+  'linuxHier=1'#010+
+  'endif'#010+
+  #010+
+  'export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOUR'+
+  'CE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+
+  #010+
+  #010+
+  '[fpcdircheckenv]'#010+
+  '####################################################################','#'+
+  #010+
+  '# FPCDIR Setting'#010+
+  '#####################################################################'#010+
+  #010+
+  '# Test FPCDIR to look if the RTL dir exists'#010+
+  'ifdef FPCDIR'#010+
+  'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)',#010+
+  'override FPCDIR=wrong'#010+
+  'endif'#010+
+  'else'#010+
+  'override FPCDIR=wrong'#010+
+  'endif'#010+
+  #010+
+  '# Default FPCDIR from Makefile.fpc'#010+
+  'ifdef DEFAULT_FPCDIR'#010+
+  'ifeq ($(FPCDIR),wrong)'#010+
+  'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)','),)'#010+
+  'override FPCDIR=wrong'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '[fpcdirdetect]'#010+
+  '# Detect FPCDIR'#010+
+  'ifeq ($(FPCDIR),wrong)'#010+
+  'ifdef inUnix'#010+
+  'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+
+  'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
+  'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION',')'#010+
+  'endif'#010+
+  'else'#010+
+  'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+
+  'suffix /$(FPC),$(SEARCHPATH))))))'#010+
+  'override FPCDIR:=$(FPCDIR)/..'#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
+  'override FPCDIR:=$(FPCDIR)/..'#010+
+  'ifeq ($(w','ildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
+  'override FPCDIR:=$(BASEDIR)'#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
+  'override FPCDIR=c:/pp'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Cross binaries dir'#010+
+  'ifndef CROSSBINDIR'#010+
+  'CROSSBINDIR:=$(wildc','ard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+
+  'endif'#010+
+  #010+
+  '# Default binutils prefix for cross compile when the'#010+
+  '# crossbindir is not set'#010+
+  'ifndef BINUTILSPREFIX'#010+
+  'ifndef CROSSBINDIR'#010+
+  'ifdef CROSSCOMPILE'#010+
+  'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif',#010+
+  #010+
+  '# Try first the full target name, otherwise try only'#010+
+  '# the OS for backwards compatibility'#010+
+  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+
+  'ifeq ($(UNITSDIR),)'#010+
+  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+
+  'endif'#010+
+  #010+
+  '# Packages dir'#010+
+  'P','ACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/'+
+  'packages/extra)'#010+
+  #010+
+  #010+
+  '[shelltools]'#010+
+  '#####################################################################'#010+
+  '# Shell tools'#010+
+  '##########################################################','##########'+
+  '#'#010+
+  #010+
+  '# Echo that can redir (must be able run in the default OS shell)'#010+
+  'ifndef ECHOREDIR'#010+
+  'ifndef inUnix'#010+
+  'ECHOREDIR=echo'#010+
+  'else'#010+
+  'ECHOREDIR=$(ECHO)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# To copy pograms'#010+
+  'ifndef COPY'#010+
+  'COPY:=$(CPPROG) -fp'#010+
+  'endif'#010+
+  #010+
+  '# Copy a whole tree'#010+
+  'ifn','def COPYTREE'#010+
+  'COPYTREE:=$(CPPROG) -Rfp'#010+
+  'endif'#010+
+  #010+
+  '# Copy a whole tree'#010+
+  'ifndef MKDIRTREE'#010+
+  'MKDIRTREE:=$(MKDIRPROG) -p'#010+
+  'endif'#010+
+  #010+
+  '# To move pograms'#010+
+  'ifndef MOVE'#010+
+  'MOVE:=$(MVPROG) -f'#010+
+  'endif'#010+
+  #010+
+  '# Check delete program'#010+
+  'ifndef DEL'#010+
+  'DEL:=$(RMPROG) -f'#010+
+  'endif'#010+
+  #010+
+  '# Check d','eltree program'#010+
+  'ifndef DELTREE'#010+
+  'DELTREE:=$(RMPROG) -rf'#010+
+  'endif'#010+
+  #010+
+  '# To install files'#010+
+  'ifndef INSTALL'#010+
+  'ifdef inUnix'#010+
+  'INSTALL:=$(GINSTALL) -c -m 644'#010+
+  'else'#010+
+  'INSTALL:=$(COPY)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# To install programs'#010+
+  'ifndef INSTALLEXE'#010+
+  'ifdef inUnix'#010+
+  'INSTALLEXE:=$(','GINSTALL) -c -m 755'#010+
+  'else'#010+
+  'INSTALLEXE:=$(COPY)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# To make a directory.'#010+
+  'ifndef MKDIR'#010+
+  'MKDIR:=$(GINSTALL) -m 755 -d'#010+
+  'endif'#010+
+  #010+
+  'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKD'+
+  'IR'#010+
+  #010+
+  #010+
+  '[defaultdirs]'#010+
+  '#####################','###############################################'+
+  '#'#010+
+  '# Default Directories'#010+
+  '#####################################################################'#010+
+  #010+
+  '# Units dir'#010+
+  'ifdef REQUIRE_UNITSDIR'#010+
+  'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+
+  'endif'#010+
+  #010+
+  '# Units dir'#010+
+  'ifdef',' REQUIRE_PACKAGESDIR'#010+
+  'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+
+  '# When zipping use the target os default, when normal install then'#010+
+  '# use the source os as default'#010+
+  'ifdef ZIPINSTALL'#010+
+  '# Zi','pinstall'#010+
+  'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+
+  'UNIXHier=1'#010+
+  'endif'#010+
+  'else'#010+
+  '# Normal install'#010+
+  'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+
+  'UNIXHier=1'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# When install prefix is not set try to use prefix'#010+
+  'ifndef INSTALL_PREFIX'#010+
+  'ifdef',' PREFIX'#010+
+  'INSTALL_PREFIX=$(PREFIX)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# set the prefix directory where to install everything'#010+
+  'ifndef INSTALL_PREFIX'#010+
+  'ifdef UNIXHier'#010+
+  'INSTALL_PREFIX=/usr/local'#010+
+  'else'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'INSTALL_BASEDIR:=/pp'#010+
+  'else'#010+
+  'INSTALL_BASEDIR:=/$(','PACKAGE_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'export INSTALL_PREFIX'#010+
+  #010+
+  '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+
+  '# used recursively for all subdirs'#010+
+  'ifdef INSTALL_FPCSUBDIR'#010+
+  'export INSTALL_FPCSUBDIR'#010+
+  'endif'#010+
+  #010+
+  '# Where to place the resulting zip files'#010,
+  'ifndef DIST_DESTDIR'#010+
+  'DIST_DESTDIR:=$(BASEDIR)'#010+
+  'endif'#010+
+  'export DIST_DESTDIR'#010+
+  #010+
+  '# EXE/PPU Target directories'#010+
+  'ifndef COMPILER_UNITTARGETDIR'#010+
+  'ifdef PACKAGEDIR_MAIN'#010+
+  'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+
+  'else'#010+
+  'COMPILER_UNITTARGE','TDIR=units/$(TARGETSUFFIX)'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifndef COMPILER_TARGETDIR'#010+
+  'COMPILER_TARGETDIR=.'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '#####################################################################'#010+
+  '# Install Directories'#010+
+  '######################################################','##############'+
+  '#'#010+
+  #010+
+  '# set the base directory where to install everything'#010+
+  'ifndef INSTALL_BASEDIR'#010+
+  'ifdef UNIXHier'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+
+  'else'#010+
+  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PAC','KAGE_NAME)'#010+
+  'endif'#010+
+  'else'#010+
+  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# set the directory where to install the binaries'#010+
+  'ifndef INSTALL_BINDIR'#010+
+  'ifdef UNIXHier'#010+
+  'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
+  'else'#010+
+  'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+
+  '#',' for FPC packages install the binaries under their target subdir'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'ifdef CROSSCOMPILE'#010+
+  'ifdef CROSSINSTALL'#010+
+  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+
+  'else'#010+
+  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
+  'endif'#010+
+  'e','lse'#010+
+  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# set the directory where to install the units.'#010+
+  'ifndef INSTALL_UNITDIR'#010+
+  'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'ifdef P','ACKAGE_NAME'#010+
+  'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Where to install shared libraries'#010+
+  'ifndef INSTALL_LIBDIR'#010+
+  'ifdef UNIXHier'#010+
+  'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+
+  'else'#010+
+  'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+
+  'endif'#010,
+  'endif'#010+
+  #010+
+  '# Where the source files will be stored'#010+
+  'ifndef INSTALL_SOURCEDIR'#010+
+  'ifdef UNIXHier'#010+
+  'ifdef BSDhier'#010+
+  'SRCPREFIXDIR=share/src'#010+
+  'else'#010+
+  'ifdef linuxHier'#010+
+  'SRCPREFIXDIR=share/src'#010+
+  'else'#010+
+  'SRCPREFIXDIR=src'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'ifdef INSTALL','_FPCSUBDIR'#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
+  ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+
+  'else'#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
+  ')/$(PACKAGE_NAME)'#010+
+  'endif'#010+
+  'else'#010+
+  'INSTALL_SOURCEDI','R:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+
+  '-$(PACKAGE_VERSION)'#010+
+  'endif'#010+
+  'else'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'ifdef INSTALL_FPCSUBDIR'#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+
+  'CKAGE_NAME)'#010+
+  'else'#010+
+  'INSTALL_SOURCEDIR:=$(','INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+
+  'endif'#010+
+  'else'#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Where the doc files will be stored'#010+
+  'ifndef INSTALL_DOCDIR'#010+
+  'ifdef UNIXHier'#010+
+  'ifdef BSDhier'#010+
+  'DOCPREFIXDIR=share/doc'#010+
+  'else'#010+
+  'ifdef lin','uxHier'#010+
+  'DOCPREFIXDIR=share/doc'#010+
+  'else'#010+
+  'DOCPREFIXDIR=doc'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+
+  '(PACKAGE_NAME)'#010+
+  'else'#010+
+  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_N','AME)-$('+
+  'PACKAGE_VERSION)'#010+
+  'endif'#010+
+  'else'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
+  'else'#010+
+  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Where to install the examples, under linux we use the doc di','r'#010+
+  '# because the copytree command will create a subdir itself'#010+
+  'ifndef INSTALL_EXAMPLEDIR'#010+
+  'ifdef UNIXHier'#010+
+  'ifdef INSTALL_FPCPACKAGE'#010+
+  #010+
+  'ifdef BSDhier'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+
+  ')/$(PACKAGE_NAME)'#010+
+  'else'#010+
+  'ifdef',' linuxHier'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+
+  'else'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
+  '$(PACKAGE_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  'else'#010+
+  #010+
+  'ifdef BSDhier'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PAC','KAGE_NAME)'+
+  '-$(PACKAGE_VERSION)'#010+
+  'else'#010+
+  'ifdef linuxHier'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+
+  'GE_VERSION)'#010+
+  'else'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+
+  'RSION)'#010+
+  'endif'#010+
+  #010+
+  'endif'#010+
+  'endif'#010+
+  'else'#010+
+  'i','fdef INSTALL_FPCPACKAGE'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
+  'else'#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Where the some extra (data)files will be stored'#010+
+  'ifndef INSTALL_DATADIR'#010+
+  'INSTALL','_DATADIR=$(INSTALL_BASEDIR)'#010+
+  'endif'#010+
+  #010+
+  '#####################################################################'#010+
+  '# Cross compile dirs'#010+
+  '#####################################################################'#010+
+  #010+
+  'ifdef CROSSCOMPILE'#010+
+  '# Directory where the cr','oss compile tools are stored.'#010+
+  '# First check if they are available in FPCDIR. If no targets/ subdir'#010+
+  '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+
+  'ifndef CROSSBINDIR'#010+
+  'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+
+  'ifeq',' ($(CROSSBINDIR),)'#010+
+  'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+
+  '(FULL_SOURCE))'#010+
+  'endif'#010+
+  'endif'#010+
+  'else'#010+
+  'CROSSBINDIR='#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[dirlibc]'#010+
+  '# On linux, try to find where libgcc.a is.'#010+
+  'ifeq ($(OS_SOURCE),linux)'#010+
+  #010+
+  '# Amd64 to i386?'#010+
+  'i','fndef GCCLIBDIR'#010+
+  'ifeq ($(CPU_TARGET),i386)'#010+
+  'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+
+  'ifeq ($(BINUTILSPREFIX),)'#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Try cross gcc'#010+
+  'ifndef GCCLIBDIR'#010+
+  'CRO','SSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+
+  'EEXT),$(SEARCHPATH))))'#010+
+  'ifneq ($(CROSSGCC),)'#010+
+  'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Other libraries from ld.so.conf'#010+
+  'ifndef OTHERLIBDIR',#010+
+  'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+
+  '"; print $1 }'#039')'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  'ifdef inUnix'#010+
+  'ifeq ($(OS_SOURCE),netbsd)'#010+
+  'OTHERLIBDIR+=/usr/pkg/lib'#010+
+  'endif'#010+
+  'export GCCLIBDIR OTHERLIB'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[extensions]'#010+
+  '#########################','###########################################'+
+  '#'#010+
+  '# Default extensions'#010+
+  '#####################################################################'#010+
+  #010+
+  '# Default needed extensions (Go32v2,Linux)'#010+
+  'BATCHEXT=.bat'#010+
+  'LOADEREXT=.as'#010+
+  'EXEEXT=.exe'#010+
+  'PPLEXT=.ppl'#010+
+  'PPUEXT=.','ppu'#010+
+  'OEXT=.o'#010+
+  'ASMEXT=.s'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'SHAREDLIBEXT=.so'#010+
+  'STATICLIBPREFIX=libp'#010+
+  'RSTEXT=.rst'#010+
+  '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
+  ' has this'#010+
+  #010+
+  '# 1.0.x has target specific extensions for ppu files and o','bjects'#010+
+  'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+
+  '# short version for 1.1 and above - no target specific extensions'#010+
+  #010+
+  '# Go32v1'#010+
+  'ifeq ($(OS_TARGET),go32v1)'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=v1'#010+
+  'endif'#010+
+  #010+
+  '# Go32v2'#010+
+  'ifeq ($(OS_TARGET),go32v2)'#010+
+  'STATICLIBPREF','IX='#010+
+  'SHORTSUFFIX=dos'#010+
+  'endif'#010+
+  #010+
+  '# watcom'#010+
+  'ifeq ($(OS_TARGET),watcom)'#010+
+  'STATICLIBPREFIX='#010+
+  'OEXT=.obj'#010+
+  'ASMEXT=.asm'#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=wat'#010+
+  'endif'#010+
+  #010+
+  '# Linux'#010+
+  'ifeq ($(OS_TARGET),linux)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=lnx'#010+
+  'endif'#010+
+  #010+
+  '# Fr','eeBSD'#010+
+  'ifeq ($(OS_TARGET),freebsd)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=fbs'#010+
+  'endif'#010+
+  #010+
+  '# NetBSD'#010+
+  'ifeq ($(OS_TARGET),netbsd)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=nbs'#010+
+  'endif'#010+
+  #010+
+  '# OpenBSD'#010+
+  'ifeq ($(OS_TARGET),openbsd)'#010+
+  'BATCHEXT=.sh'#010+
+  'E','XEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=obs'#010+
+  'endif'#010+
+  #010+
+  '# Win32'#010+
+  'ifeq ($(OS_TARGET),win32)'#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=w32'#010+
+  'endif'#010+
+  #010+
+  '# OS/2'#010+
+  'ifeq ($(OS_TARGET),os2)'#010+
+  'BATCHEXT=.cmd'#010+
+  'AOUTEXT=.out'#010+
+  'STATICLIBPREFIX='#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=os2'#010+
+  'ECHO=echo'#010+
+  'e','ndif'#010+
+  #010+
+  '# EMX'#010+
+  'ifeq ($(OS_TARGET),emx)'#010+
+  'BATCHEXT=.cmd'#010+
+  'AOUTEXT=.out'#010+
+  'STATICLIBPREFIX='#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=emx'#010+
+  'ECHO=echo'#010+
+  'endif'#010+
+  #010+
+  '# Amiga'#010+
+  'ifeq ($(OS_TARGET),amiga)'#010+
+  'EXEEXT='#010+
+  'SHAREDLIBEXT=.library'#010+
+  'SHORTSUFFIX=amg'#010+
+  'endif'#010+
+  #010+
+  '# MorphOS'#010+
+  'ifeq ($(OS_T','ARGET),morphos)'#010+
+  'EXEEXT='#010+
+  'SHAREDLIBEXT=.library'#010+
+  'SHORTSUFFIX=mos'#010+
+  'endif'#010+
+  #010+
+  '# Atari'#010+
+  'ifeq ($(OS_TARGET),atari)'#010+
+  'EXEEXT=.ttp'#010+
+  'SHORTSUFFIX=ata'#010+
+  'endif'#010+
+  #010+
+  '# BeOS'#010+
+  'ifeq ($(OS_TARGET),beos)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=be'#010+
+  'endif'#010+
+  #010+
+  '# Solaris'#010+
+  'ifeq ($(OS_TARGET','),solaris)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=sun'#010+
+  'endif'#010+
+  #010+
+  '# QNX'#010+
+  'ifeq ($(OS_TARGET),qnx)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=qnx'#010+
+  'endif'#010+
+  #010+
+  '# Netware clib'#010+
+  'ifeq ($(OS_TARGET),netware)'#010+
+  'EXEEXT=.nlm'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=nw'#010+
+  'endif'#010+
+  #010+
+  '# Netware libc'#010+
+  'if','eq ($(OS_TARGET),netwlibc)'#010+
+  'EXEEXT=.nlm'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=nwl'#010+
+  'endif'#010+
+  #010+
+  '# MacOS'#010+
+  'ifeq ($(OS_TARGET),macos)'#010+
+  'BATCHEXT='#010+
+  'EXEEXT='#010+
+  'DEBUGSYMEXT=.xcoff'#010+
+  'SHORTSUFFIX=mac'#010+
+  'endif'#010+
+  #010+
+  '# Darwin'#010+
+  'ifeq ($(OS_TARGET),darwin)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDL','IB=1'#010+
+  'SHORTSUFFIX=dwn'#010+
+  'endif'#010+
+  #010+
+  'else'#010+
+  '# long version for 1.0.x - target specific extensions'#010+
+  #010+
+  '# Go32v1'#010+
+  'ifeq ($(OS_TARGET),go32v1)'#010+
+  'PPUEXT=.pp1'#010+
+  'OEXT=.o1'#010+
+  'ASMEXT=.s1'#010+
+  'SMARTEXT=.sl1'#010+
+  'STATICLIBEXT=.a1'#010+
+  'SHAREDLIBEXT=.so1'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=v1'#010+
+  'end','if'#010+
+  #010+
+  '# Go32v2'#010+
+  'ifeq ($(OS_TARGET),go32v2)'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=dos'#010+
+  'endif'#010+
+  #010+
+  '# watcom'#010+
+  'ifeq ($(OS_TARGET),watcom)'#010+
+  'STATICLIBPREFIX='#010+
+  'SHORTSUFFIX=wat'#010+
+  'endif'#010+
+  #010+
+  '# Linux'#010+
+  'ifeq ($(OS_TARGET),linux)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=ln','x'#010+
+  'endif'#010+
+  #010+
+  '# FreeBSD'#010+
+  'ifeq ($(OS_TARGET),freebsd)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=fbs'#010+
+  'endif'#010+
+  #010+
+  '# NetBSD'#010+
+  'ifeq ($(OS_TARGET),netbsd)'#010+
+  'BATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=nbs'#010+
+  'endif'#010+
+  #010+
+  '# OpenBSD'#010+
+  'ifeq ($(OS_TARGET),openbsd)'#010+
+  'B','ATCHEXT=.sh'#010+
+  'EXEEXT='#010+
+  'HASSHAREDLIB=1'#010+
+  'SHORTSUFFIX=obs'#010+
+  'endif'#010+
+  #010+
+  '# Win32'#010+
+  'ifeq ($(OS_TARGET),win32)'#010+
+  'PPUEXT=.ppw'#010+
+  'OEXT=.ow'#010+
+  'ASMEXT=.sw'#010+
+  'SMARTEXT=.slw'#010+
+  'STATICLIBEXT=.aw'#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=w32'#010+
+  'endif'#010+
+  #010+
+  '# OS/2'#010+
+  'ifeq ($(OS_TARGET),os2)'#010+
+  'BATCHEXT=.cmd',#010+
+  'PPUEXT=.ppo'#010+
+  'ASMEXT=.so2'#010+
+  'OEXT=.oo2'#010+
+  'AOUTEXT=.out'#010+
+  'SMARTEXT=.sl2'#010+
+  'STATICLIBPREFIX='#010+
+  'STATICLIBEXT=.ao2'#010+
+  'SHAREDLIBEXT=.dll'#010+
+  'SHORTSUFFIX=os2'#010+
+  'ECHO=echo'#010+
+  'endif'#010+
+  #010+
+  '# Amiga'#010+
+  'ifeq ($(OS_TARGET),amiga)'#010+
+  'EXEEXT='#010+
+  'PPUEXT=.ppu'#010+
+  'ASMEXT=.asm'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATI','CLIBEXT=.a'#010+
+  'SHAREDLIBEXT=.library'#010+
+  'SHORTSUFFIX=amg'#010+
+  'endif'#010+
+  #010+
+  '# Atari'#010+
+  'ifeq ($(OS_TARGET),atari)'#010+
+  'PPUEXT=.ppu'#010+
+  'ASMEXT=.s'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'EXEEXT=.ttp'#010+
+  'SHORTSUFFIX=ata'#010+
+  'endif'#010+
+  #010+
+  '# BeOS'#010+
+  'ifeq ($(OS_TARGET),beos)'#010+
+  'BATCHEXT=.sh'#010+
+  'PPUEXT=.ppu',#010+
+  'ASMEXT=.s'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=be'#010+
+  'endif'#010+
+  #010+
+  '# Solaris'#010+
+  'ifeq ($(OS_TARGET),solaris)'#010+
+  'BATCHEXT=.sh'#010+
+  'PPUEXT=.ppu'#010+
+  'ASMEXT=.s'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=sun'#010+
+  'endif'#010+
+  #010+
+  '# QNX'#010+
+  'ifeq ($(OS_TARG','ET),qnx)'#010+
+  'BATCHEXT=.sh'#010+
+  'PPUEXT=.ppu'#010+
+  'ASMEXT=.s'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'EXEEXT='#010+
+  'SHORTSUFFIX=qnx'#010+
+  'endif'#010+
+  #010+
+  '# Netware'#010+
+  'ifeq ($(OS_TARGET),netware)'#010+
+  'STATICLIBPREFIX='#010+
+  'PPUEXT=.ppu'#010+
+  'OEXT=.o'#010+
+  'ASMEXT=.s'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'SHAREDLIBEXT=.','nlm'#010+
+  'EXEEXT=.nlm'#010+
+  'SHORTSUFFIX=nw'#010+
+  'endif'#010+
+  #010+
+  '# Netware libc'#010+
+  'ifeq ($(OS_TARGET),netwlibc)'#010+
+  'STATICLIBPREFIX='#010+
+  'PPUEXT=.ppu'#010+
+  'OEXT=.o'#010+
+  'ASMEXT=.s'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'SHAREDLIBEXT=.nlm'#010+
+  'EXEEXT=.nlm'#010+
+  'SHORTSUFFIX=nwl'#010+
+  'endif'#010+
+  #010+
+  '# MacOS'#010+
+  'ifeq ($(OS_TARGET),ma','cos)'#010+
+  'BATCHEXT='#010+
+  'PPUEXT=.ppu'#010+
+  'ASMEXT=.s'#010+
+  'OEXT=.o'#010+
+  'SMARTEXT=.sl'#010+
+  'STATICLIBEXT=.a'#010+
+  'EXEEXT='#010+
+  'DEBUGSYMEXT=.xcoff'#010+
+  'SHORTSUFFIX=mac'#010+
+  'endif'#010+
+  #010+
+  '#end of target specific settings'#010+
+  'endif'#010+
+  #010+
+  '# For 8.3 limited OS'#039's the short suffixes'#010+
+  '# Otherwise use the full source/ta','rget names'#010+
+  'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+
+  'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+
+  'ZIPSUFFIX=$(SHORTSUFFIX)'#010+
+  'ZIPCROSSPREFIX='#010+
+  'ZIPSOURCESUFFIX=src'#010+
+  'ZIPEXAMPLESUFFIX=exm'#010+
+  'else'#010+
+  'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+
+  'ZIPSOURCESUFFIX=.source'#010+
+  'ZIPEXA','MPLESUFFIX=.examples'#010+
+  'ifdef CROSSCOMPILE'#010+
+  'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+
+  'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+
+  'else'#010+
+  'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+
+  'ZIPCROSSPREFIX='#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '[defaulttools]'#010+
   '#################################################################','###'+
-  '#'#013#010+
-  '# Loaders'#013#010+
-  '#####################################################################'#013+
+  '#'#010+
+  '# Default Tools'#010+
+  '#####################################################################'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_loaders'#013#010+
-  #013#010+
-  'ifneq ($(TARGET_LOADERS),)'#013#010+
-  'override ALLTARGET+=fpc_loaders'#013#010+
-  'override CLEANTARGET+=fpc_loaders_clean'#013#010+
-  'override INSTALLTARGET+=f','pc_loaders_install'#013#010+
-  #013#010+
-  'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '%$(OEXT): %$(LOADEREXT)'#013#010+
-  'ifdef COMPILER_UNITTARGETDIR'#013#010+
-  '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#013#010+
-  'else'#013#010+
-  '        $(AS) -o $*$(OEXT) $','<'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#013#010+
-  #013#010+
-  'fpc_loaders_clean:'#013#010+
-  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  '# Names of the binutils tools'#010+
+  'ASNAME=$(BINUTILSPREFIX)as'#010+
+  'LDNAME=$(BINUTILSPREFIX)ld'#010+
+  'ARNAME=$(BINUTILSPREFIX)ar'#010+
+  'RCNAME=$(BINUTILSPREFIX)rc'#010+
+  'ifneq ($(f','indstring 1.0.,$(FPC_VERSION)),)'#010+
+  'ifeq ($(OS_TARGET),win32)'#010+
+  'ifeq ($(CROSSBINDIR),)'#010+
+  'ASNAME=asw'#010+
+  'LDNAME=ldw'#010+
+  'ARNAME=arw'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# assembler, redefine it if cross compiling'#010+
+  'ifndef ASPROG'#010+
+  'ifdef CROSSBINDIR'#010+
+  'ASPROG=$(CROSSBINDIR)/$(ASNAME',')$(SRCEXEEXT)'#010+
+  'else'#010+
+  'ASPROG=$(ASNAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# linker, but probably not used'#010+
+  'ifndef LDPROG'#010+
+  'ifdef CROSSBINDIR'#010+
+  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+
+  'else'#010+
+  'LDPROG=$(LDNAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Resource compiler'#010+
+  'ifndef RCPROG'#010+
+  'ifdef CROSSBIN','DIR'#010+
+  'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+
+  'else'#010+
+  'RCPROG=$(RCNAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Archiver'#010+
+  'ifndef ARPROG'#010+
+  'ifdef CROSSBINDIR'#010+
+  'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+
+  'else'#010+
+  'ARPROG=$(ARNAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Override defaults'#010+
+  'AS=$(ASPROG)'#010+
+  'LD','=$(LDPROG)'#010+
+  'RC=$(RCPROG)'#010+
+  'AR=$(ARPROG)'#010+
+  #010+
+  '# ppas.bat / ppas.sh'#010+
+  'PPAS=ppas$(SRCBATCHEXT)'#010+
+  #010+
+  '# ldconfig to rebuild .so cache'#010+
+  'ifdef inUnix'#010+
+  'LDCONFIG=ldconfig'#010+
+  'else'#010+
+  'LDCONFIG='#010+
+  'endif'#010+
+  #010+
+  'ifdef DATE'#010+
+  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+
+  'else'#010+
+  'DATESTR='#010+
+  'endif'#010+
+  #010+
+  '# Loo','k if UPX is found for go32v2 and win32. We can'#039't use $UPX b'+
+  'ecuase'#010+
+  '# upx uses that one itself (PFV)'#010+
+  'ifndef UPXPROG'#010+
+  'ifeq ($(OS_TARGET),go32v2)'#010+
+  'UPXPROG:=1'#010+
+  'endif'#010+
+  'ifeq ($(OS_TARGET),win32)'#010+
+  'UPXPROG:=1'#010+
+  'endif'#010+
+  'ifdef UPXPROG'#010+
+  'UPXPROG:=$(strip $(wildca','rd $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPAT'+
+  'H))))'#010+
+  'ifeq ($(UPXPROG),)'#010+
+  'UPXPROG='#010+
+  'else'#010+
+  'UPXPROG:=$(firstword $(UPXPROG))'#010+
+  'endif'#010+
+  'else'#010+
+  'UPXPROG='#010+
+  'endif'#010+
+  'endif'#010+
+  'export UPXPROG'#010+
+  #010+
+  '# Zip options'#010+
+  'ZIPOPT=-9'#010+
+  'ZIPEXT=.zip'#010+
+  #010+
+  '# Tar options'#010+
+  'ifeq ($(USETAR),bz2)'#010+
+  'TAROP','T=vj'#010+
+  'TAREXT=.tar.bz2'#010+
+  'else'#010+
+  'TAROPT=vz'#010+
+  'TAREXT=.tar.gz'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[command_begin]'#010+
+  '#####################################################################'#010+
+  '# Compiler Command Line'#010+
+  '#####################################################################'#010+
+  #010,
+  '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+
+  '# compiler this needs to be turned off'#010+
+  'ifndef NOCPUDEF'#010+
+  'override FPCOPTDEF=$(CPU_TARGET)'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '# Load commandline OPT and add target and unit dir to be sure'#010+
+  'ifneq ($(OS_TA','RGET),$(OS_SOURCE))'#010+
+  'override FPCOPT+=-T$(OS_TARGET)'#010+
+  'endif'#010+
+  #010+
+  'ifeq ($(OS_SOURCE),openbsd)'#010+
+  'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
+  'endif'#010+
+  #010+
+  'ifndef CROSSBOOTSTRAP'#010+
+  'ifneq ($(BINUTILSPREFIX),)'#010+
+  'override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc'#010+
+  'endif'#010+
+  'ifneq ($','(BINUTILSPREFIX),)'#010+
+  'override FPCOPT+=-Xr$(RLINKPATH)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# User dirs should be first, so they are looked at first'#010+
+  'ifdef UNITDIR'#010+
+  'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
+  'endif'#010+
+  'ifdef LIBDIR'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(LIBDI','R))'#010+
+  'endif'#010+
+  'ifdef OBJDIR'#010+
+  'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
+  'endif'#010+
+  'ifdef INCDIR'#010+
+  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
+  'endif'#010+
+  #010+
+  '# Smartlinking'#010+
+  'ifdef LINKSMART'#010+
+  'override FPCOPT+=-XX'#010+
+  'endif'#010+
+  #010+
+  '# Smartlinking creation'#010+
+  'ifdef CREATESMART'#010+
+  'ov','erride FPCOPT+=-CX'#010+
+  'endif'#010+
+  #010+
+  '# Debug'#010+
+  'ifdef DEBUG'#010+
+  'override FPCOPT+=-gl'#010+
+  'override FPCOPTDEF+=DEBUG'#010+
+  'endif'#010+
+  #010+
+  '# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+
+  'ifdef RELEASE'#010+
+  'ifeq ($(CPU_TARGET),i386)'#010+
+  'FPCCPUOPT:=-OG2p3'#010+
+  'else'#010+
+  'ifeq ($(CPU_TARGET),p','owerpc)'#010+
+  'FPCCPUOPT:=-O1r'#010+
+  'else'#010+
+  'FPCCPUOPT:='#010+
+  'endif'#010+
+  'endif'#010+
+  'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
+  'override FPCOPTDEF+=RELEASE'#010+
+  'endif'#010+
+  #010+
+  '# Strip'#010+
+  'ifdef STRIP'#010+
+  'override FPCOPT+=-Xs'#010+
+  'endif'#010+
+  #010+
+  '# Optimizer (i386 only for now)'#010+
+  'ifdef OPTIMIZE'#010+
+  'ifeq ($(CPU_TARG','ET),i386)'#010+
+  'override FPCOPT+=-OG2p3'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Verbose settings (warning,note,info)'#010+
+  'ifdef VERBOSE'#010+
+  'override FPCOPT+=-vwni'#010+
+  'endif'#010+
+  #010+
+  '# Needed compiler options'#010+
+  'ifdef COMPILER_OPTIONS'#010+
+  'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
+  'endif'#010+
+  'ifdef COMPILER_UNI','TDIR'#010+
+  'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
+  'endif'#010+
+  'ifdef COMPILER_LIBRARYDIR'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
+  'endif'#010+
+  'ifdef COMPILER_OBJECTDIR'#010+
+  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
+  'endif',#010+
+  'ifdef COMPILER_INCLUDEDIR'#010+
+  'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
+  'endif'#010+
+  #010+
+  '# Cross compiler utils'#010+
+  'ifdef CROSSBINDIR'#010+
+  'override FPCOPT+=-FD$(CROSSBINDIR)'#010+
+  'endif'#010+
+  #010+
+  '# Target dirs and the prefix to use for clean/install'#010+
+  'ifdef COMPIL','ER_TARGETDIR'#010+
+  'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
+  'ifeq ($(COMPILER_TARGETDIR),.)'#010+
+  'override TARGETDIRPREFIX='#010+
+  'else'#010+
+  'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Unit target dir (default is units/<cpu>-<os>/'#010+
+  'ifdef COMPILER','_UNITTARGETDIR'#010+
+  'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
+  'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
+  'override UNITTARGETDIRPREFIX='#010+
+  'else'#010+
+  'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
+  'endif'#010+
+  'else'#010+
+  'ifdef COMPILER_TARGETDIR'#010+
+  'override COMPILER','_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
+  'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Temporary hack to add HASUNIX define for linux 1.0.6 compiler'#010+
+  'ifeq ($(OS_TARGET),linux)'#010+
+  'ifeq ($(FPC_VERSION),1.0.6)'#010+
+  'override FPCOPTDEF+=HASU','NIX'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '[command_libc]'#010+
+  '# Add GCC lib path if asked'#010+
+  'ifdef GCCLIBDIR'#010+
+  'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
+  'endif'#010+
+  'ifdef OTHERLIBDIR'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[command_end]'#010+
+  '# Add commandline options last so th','ey can override'#010+
+  'ifdef OPT'#010+
+  'override FPCOPT+=$(OPT)'#010+
+  'endif'#010+
+  #010+
+  '# Add defines from FPCOPTDEF to FPCOPT'#010+
+  'ifdef FPCOPTDEF'#010+
+  'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
+  'endif'#010+
+  #010+
+  '# Was a config file specified ?'#010+
+  'ifdef CFGFILE'#010+
+  'override FPCOPT+=@$(CFGFILE)'#010,
+  'endif'#010+
+  #010+
+  '# Use the environment to pass commandline options?'#010+
+  'ifdef USEENV'#010+
+  'override FPCEXTCMD:=$(FPCOPT)'#010+
+  'override FPCOPT:=!FPCEXTCMD'#010+
+  'export FPCEXTCMD'#010+
+  'endif'#010+
+  #010+
+  '# Compiler commandline'#010+
+  'override COMPILER:=$(FPC) $(FPCOPT)'#010+
+  #010+
+  '# also call ppas if with co','mmand option -s'#010+
+  '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
+  'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
+  'EXECPPAS='#010+
+  'else'#010+
+  'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+
+  'EXECPPAS:=@$(PPAS)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[loaderrules]'#010+
+  '###############################','#####################################'+
+  '#'#010+
+  '# Loaders'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_loaders'#010+
+  #010+
+  'ifneq ($(TARGET_LOADERS),)'#010+
+  'override ALLTARGET+=fpc_loaders'#010+
+  'override CLEANTARGET+=fpc_loaders_clean'#010,
+  'override INSTALLTARGET+=fpc_loaders_install'#010+
+  #010+
+  'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
+  'endif'#010+
+  #010+
+  '%$(OEXT): %$(LOADEREXT)'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
+  '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
+  'else'#010+
+  '        $(AS',') -o $*$(OEXT) $<'#010+
+  'endif'#010+
+  #010+
+  'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
+  #010+
+  'fpc_loaders_clean:'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
   '        -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
-  ')'#013#010+
-  'else'#013#010+
-  '        -$(DEL) $(LOADEROFILES)'#013#010+
-  'endif'#013#010+
-  #013,#010+
-  'fpc_loaders_install:'#013#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
-  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  ')'#010+
+  'else'#010+
+  '        -$(DEL) $(LOADEROFILES)'#010+
+  'en','dif'#010+
+  #010+
+  'fpc_loaders_install:'#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
   '        $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
-  'ES)) $(INSTALL_UNITDIR)'#013#010+
-  'else'#013#010+
-  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNIT','DIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[unitrules]'#013#010+
-  '#####################################################################'#013+
+  'ES)) $(INSTALL_UNITDIR)'#010+
+  'else'#010+
+  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITD','IR)'#010+
+  'endif'#010+
   #010+
-  '# Units'#013#010+
-  '#####################################################################'#013+
   #010+
-  #013#010+
-  '.PHONY: fpc_units'#013#010+
-  #013#010+
-  'ifneq ($(TARGET_UNITS),)'#013#010+
-  'override A','LLTARGET+=fpc_units'#013#010+
-  #013#010+
-  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#013#010+
+  '[unitrules]'#010+
+  '#####################################################################'#010+
+  '# Units'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_units'#010+
+  #010+
+  'ifneq ($(TARGET_UNITS),)'#010+
+  'override ALLTARGET+=fpc','_units'#010+
+  #010+
+  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
   'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
-  'NITS))'#013#010+
-  'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#013#010+
-  'override C','LEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#013#010+
-  #013#010+
-  #013#010+
-  '[exerules]'#013#010+
-  '#####################################################################'#013+
+  'NITS))'#010+
+  'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
+  'override CLEANPPUFILES+=$(UN','ITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
+  'endif'#010+
   #010+
-  '# Exes'#013#010+
-  '###########################','#########################################'+
-  '#'#013#010+
-  #013#010+
-  '.PHONY: fpc_exes'#013#010+
-  #013#010+
-  '# Programs are not needed for a cross installation'#013#010+
-  'ifndef CROSSINSTALL'#013#010+
-  'ifneq ($(TARGET_PROGRAMS),)'#013#010+
-  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#013#010+
-  'override EX','EOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
+  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
+  #010+
+  #010+
+  '[exerules]'#010+
+  '#####################################################################'#010+
+  '# Exes'#010+
+  '######################################################','##############'+
+  '#'#010+
+  #010+
+  '.PHONY: fpc_exes'#010+
+  #010+
+  '# Programs are not needed for a cross installation'#010+
+  'ifndef CROSSINSTALL'#010+
+  'ifneq ($(TARGET_PROGRAMS),)'#010+
+  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
+  'override EXEOFILES:=$(addsuffix $(OEXT),$(TARG','ET_PROGRAMS)) $(addpre'+
   'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
-  ')'#013#010+
-  #013#010+
-  'override ALLTARGET+=fpc_exes'#013#010+
-  'override INSTALLEXEFILES+=$(EXEFILES)'#013#010+
-  'override CLEANEXEFILES+=$(EXEFILES) $(E','XEOFILES)'#013#010+
-  'ifeq ($(OS_TARGET),os2)'#013#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#013+
+  ')'#010+
   #010+
-  'endif'#013#010+
-  'ifeq ($(OS_TARGET),emx)'#013#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#013+
+  'override ALLTARGET+=fpc_exes'#010+
+  'override INSTALLEXEFILES+=$(EXEFILES)'#010+
+  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
+  'ifeq ($(OS_TARGET),os2)'#010+
+  'overr','ide CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
+  'endif'#010+
+  'ifeq ($(OS_TARGET),emx)'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
   #010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_exes: $(C','OMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+
-  ')'#013#010+
-  #013#010+
-  #013#010+
-  '[rstrules]'#013#010+
-  '#####################################################################'#013+
+  'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EX','EFILES'+
+  ')'#010+
   #010+
-  '# Resource strings'#013#010+
-  '#####################################################################'#013+
   #010+
-  #013#010+
-  'if','def TARGET_RSTS'#013#010+
-  'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#013#010+
-  #013#010+
-  'override CLEANRSTFILES+=$(RSTFILES)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[examplerules]'#013#010+
-  '#####################################################################'#013+
+  '[rstrules]'#010+
+  '#####################################################################'#010+
+  '# Resource strings'#010+
+  '#####################################################################'#010+
   #010+
-  '# Examples'#013#010+
-  '#################','###################################################'+
-  '#'#013#010+
-  #013#010+
-  '.PHONY: fpc_examples'#013#010+
-  #013#010+
-  'ifneq ($(TARGET_EXAMPLES),)'#013#010+
-  'HASEXAMPLES=1'#013#010+
+  'ifdef TARGET_RSTS'#010+
+  'override RSTFILES=$(addsuffix $(RSTEXT),$','(TARGET_RSTS))'#010+
+  #010+
+  'override CLEANRSTFILES+=$(RSTFILES)'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[examplerules]'#010+
+  '#####################################################################'#010+
+  '# Examples'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_e','xamples'#010+
+  #010+
+  'ifneq ($(TARGET_EXAMPLES),)'#010+
+  'HASEXAMPLES=1'#010+
   'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
-  'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(a','ddsuffix .lpr,$(TARGET'+
-  '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#013#010+
-  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#013#010+
+  'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+
+  'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
+  'o','verride EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
-  'refix $(STATICLIBPREFIX),$(adds','uffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
-  'ES)))'#013#010+
-  #013#010+
-  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#013#010+
-  'ifeq ($(OS_TARGET),os2)'#013#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#013+
+  'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
+  ')))'#010+
   #010+
-  'endif'#013#010+
-  'ifeq ($(OS_TARGET),emx)'#013#010+
-  'override CL','EANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#013+
+  'override CLEANEXEFILES+=$(EXAMP','LEFILES) $(EXAMPLEOFILES)'#010+
+  'ifeq ($(OS_TARGET),os2)'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+  'endif'#010+
+  'ifeq ($(OS_TARGET),emx)'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifneq ($(TARGE','T_EXAMPLEDIRS),)'#010+
+  'HASEXAMPLES=1'#010+
+  'endif'#010+
   #010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifneq ($(TARGET_EXAMPLEDIRS),)'#013#010+
-  'HASEXAMPLES=1'#013#010+
-  'endif'#013#010+
-  #013#010+
   'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
-  'S))'#013#010+
-  #013#010+
-  #013#010+
-  '[compilerules]'#013#010+
-  '##################','##################################################'+
-  '#'#013#010+
-  '# General compile rules'#013#010+
-  '#####################################################################'#013+
+  'S))'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#013#010+
-  #013#010+
-  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTA','RGET)'#013#010+
-  '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#013#010+
-  #013#010+
-  'fpc_all: $(FPCMADE)'#013#010+
-  #013#010+
-  'fpc_smart:'#013#010+
-  '        $(MAKE) all LINKSMART=1 CREATESMART=1'#013#010+
-  #013#010+
-  'fpc_debug:'#013#010+
-  '        $(MAKE) all DEBUG=1'#013#010+
-  #013#010+
-  'fpc_release:'#013#010+
-  '        $(MAKE) all RELEASE=1'#013#010+
-  #013#010+
-  '# General co','mpile rules, available for both possible .pp and .pas ex'+
-  'tensions'#013#010+
-  #013#010+
-  '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#013+
   #010+
-  #013#010+
-  '$(COMPILER_UNITTARGETDIR):'#013#010+
-  '        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#013#010+
-  #013#010+
-  '$(COMPILER_TARGETDIR):'#013#010,
-  '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#013#010+
-  #013#010+
-  '%$(PPUEXT): %.pp'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010+
-  #013#010+
-  '%$(PPUEXT): %.pas'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010+
-  #013#010+
-  '%$(EXEEXT): %.pp'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010,
-  #013#010+
-  '%$(EXEEXT): %.pas'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010+
-  #013#010+
-  '%$(EXEEXT): %.lpr'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010+
-  #013#010+
-  '%$(EXEEXT): %.dpr'#013#010+
-  '        $(COMPILER) $<'#013#010+
-  '        $(EXECPPAS)'#013#010+
-  #013#010+
-  '%.res: %.rc'#013#010+
-  '        windres -i $< -o $@',#013#010+
-  #013#010+
-  '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#013#010+
-  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
-  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
-  'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
-  'vpath %.dpr $(C','OMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
-  'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#013#010+
-  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#013#010+
-  #013#010+
-  '[libraryrules]'#013#010+
-  '#####################################################################'#013+
+  '[compilerules]'#010+
+  '#####################################################################'#010+
+  '# General compile rules'#010+
+  '#################','###################################################'+
+  '#'#010+
   #010+
-  '# Library'#013#010+
-  '###########','#########################################################'+
-  '#'#013#010+
-  #013#010+
-  '.PHONY: fpc_shared'#013#010+
-  #013#010+
-  'ifndef LIB_FULLNAME'#013#010+
-  'ifdef LIB_VERSION'#013#010+
-  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#013#010+
-  'else'#013#010+
-  'LIB_FULLNAME=$(LIB_NAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Default sharedlib units a','re all unit objects'#013#010+
-  'ifndef LIB_SHAREDUNITS'#013#010+
-  'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_shared: all'#013#010+
-  'ifdef HASSHAREDLIB'#013#010+
-  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#013#010+
-  'else'#013#010+
-  '        @$(ECHO) Shared Libraries not supported'#013#010+
-  'end','if'#013#010+
-  #013#010+
-  #013#010+
-  '[installrules]'#013#010+
-  '#####################################################################'#013+
+  '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+
   #010+
-  '# Install rules'#013#010+
-  '#####################################################################'#013+
+  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
+  '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstal','l'#013#010+
-  #013#010+
-  'ifdef INSTALL_UNITS'#013#010+
-  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef INSTALL_BUILDUNIT'#013#010+
+  'fpc_all: $(FPCMADE)'#010+
+  #010+
+  'fpc_smart:'#010+
+  '        $(MAKE) ','all LINKSMART=1 CREATESMART=1'#010+
+  #010+
+  'fpc_debug:'#010+
+  '        $(MAKE) all DEBUG=1'#010+
+  #010+
+  'fpc_release:'#010+
+  '        $(MAKE) all RELEASE=1'#010+
+  #010+
+  '# General compile rules, available for both possible .pp and .pas exte'+
+  'nsions'#010+
+  #010+
+  '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lp','r .dpr .pp .rc .res'#010+
+  #010+
+  '$(COMPILER_UNITTARGETDIR):'#010+
+  '        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
+  #010+
+  '$(COMPILER_TARGETDIR):'#010+
+  '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
+  #010+
+  '%$(PPUEXT): %.pp'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%$(PPUEXT): %.pa','s'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%$(EXEEXT): %.pp'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%$(EXEEXT): %.pas'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%$(EXEEXT): %.lpr'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%$(EXEEXT','): %.dpr'#010+
+  '        $(COMPILER) $<'#010+
+  '        $(EXECPPAS)'#010+
+  #010+
+  '%.res: %.rc'#010+
+  '        windres -i $< -o $@'#010+
+  #010+
+  '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
+  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILE','R_INCLUDEDIR)'#010+
+  'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
+  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
+  #010+
+  '[libraryrules]'#010+
+  '############','########################################################'+
+  '#'#010+
+  '# Library'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_shared'#010+
+  #010+
+  'ifndef LIB_FULLNAME'#010+
+  'ifdef LIB_VERSION'#010+
+  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+
+  'els','e'#010+
+  'LIB_FULLNAME=$(LIB_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Default sharedlib units are all unit objects'#010+
+  'ifndef LIB_SHAREDUNITS'#010+
+  'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+
+  'endif'#010+
+  #010+
+  'fpc_shared: all'#010+
+  'ifdef HASSHAREDLIB'#010+
+  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)',#010+
+  'else'#010+
+  '        @$(ECHO) Shared Libraries not supported'#010+
+  'endif'#010+
+  #010+
+  #010+
+  '[installrules]'#010+
+  '#####################################################################'#010+
+  '# Install rules'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY',': fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
+  #010+
+  'ifdef INSTALL_UNITS'#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
+  'endif'#010+
+  #010+
+  'ifdef INSTALL_BUILDUNIT'#010+
   'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
-  '(INSTALLPPUFILES))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef INSTALLP','PUFILES'#013#010+
+  '(','INSTALLPPUFILES))'#010+
+  'endif'#010+
+  #010+
+  'ifdef INSTALLPPUFILES'#010+
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
   'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
-  ',$(INSTALLPPUFILES)))'#013#010+
-  'ifneq ($(UNITTARGETDIRPREFIX),)'#013#010+
-  'override INSTALLPPUFILES:=$(addpref','ix $(UNITTARGETDIRPREFIX),$(notdi'+
-  'r $(INSTALLPPUFILES)))'#013#010+
+  ',$(INSTALLPPUFILES)))'#010+
+  'ifneq ($(UNITTARGETDIRPREFIX),)',#010+
+  'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
+  '$(INSTALLPPUFILES)))'#010+
   'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
-  'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#013#010+
-  'endif'#013#010+
-  '# Implicitly install Package.fpc'#013#010+
-  'override INSTALL_CREATEPACKAGE','FPC=1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef INSTALLEXEFILES'#013#010+
-  'ifneq ($(TARGETDIRPREFIX),)'#013#010+
+  'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
+  'endif'#010+
+  '# Implicitly install Package.fp','c'#010+
+  'override INSTALL_CREATEPACKAGEFPC=1'#010+
+  'endif'#010+
+  #010+
+  'ifdef INSTALLEXEFILES'#010+
+  'ifneq ($(TARGETDIRPREFIX),)'#010+
   'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
-  'STALLEXEFILES)))'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_install: all $(INSTALLTARGET)'#013#010+
-  'ifdef INSTALLEXEFILES'#013#010+
-  '        $(','MKDIR) $(INSTALL_BINDIR)'#013#010+
-  '# Compress the exes if upx is defined'#013#010+
-  'ifdef UPXPROG'#013#010+
-  '        -$(UPXPROG) $(INSTALLEXEFILES)'#013#010+
-  'endif'#013#010+
-  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#013#010+
-  'endif'#013#010+
-  'ifdef INSTALL_CREATEPACKAGEFPC'#013#010+
-  'ifdef FPCMAKE'#013,#010+
+  'STALLEXEFILES)))'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  'fpc_install: all $(INSTALLTARGET)'#010+
+  'ifdef INSTA','LLEXEFILES'#010+
+  '        $(MKDIR) $(INSTALL_BINDIR)'#010+
+  '# Compress the exes if upx is defined'#010+
+  'ifdef UPXPROG'#010+
+  '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
+  'endif'#010+
+  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
+  'endif'#010+
+  'ifdef INSTALL_CREATEPACKAGEFPC'#010+
+  'i','fdef FPCMAKE'#010+
   '# If the fpcpackage variable is set then create and install Package.fp'+
-  'c,'#013#010+
-  '# a safety check is done if Makefile.fpc is available'#013#010+
-  'ifdef PACKAGE_VERSION'#013#010+
-  'ifneq ($(wildcard Makefile.fpc),)'#013#010+
-  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) M','akefile.fpc'#013#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
-  '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifdef INSTALLPPUFILES'#013#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
-  '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNI','TDIR)'#013#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#013#010+
-  '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#013#010+
-  'endif'#013#010+
-  'ifneq ($(wildcard $(LIB_FULLNAME)),)'#013#010+
-  '        $(MKDIR) $(INSTALL_LIBDIR)'#013#010+
-  '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#013#010+
-  'ifd','ef inUnix'#013#010+
-  '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'ifdef INSTALL_FILES'#013#010+
-  '        $(MKDIR) $(INSTALL_DATADIR)'#013#010+
-  '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_sourceinstall: dist','clean'#013#010+
-  '        $(MKDIR) $(INSTALL_SOURCEDIR)'#013#010+
-  '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#013#010+
-  #013#010+
-  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#013#010+
-  'ifdef HASEXAMPLES'#013#010+
-  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#013#010+
-  'endif'#013#010+
-  'ifde','f EXAMPLESOURCEFILES'#013#010+
-  '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#013#010+
-  'endif'#013#010+
-  'ifdef TARGET_EXAMPLEDIRS'#013#010+
+  'c,'#010+
+  '# a safety check is done if Makefile.fpc is available'#010+
+  'ifdef PACKAGE_VERSION'#010+
+  'ifneq ($(wildcard Makefile.fpc),)'#010+
+  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_T','ARGET) Makefile.fpc'#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
+  '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifdef INSTALLPPUFILES'#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
+  '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNIT','DIR)'#010+
+  'ifneq ($(INSTALLPPULINKFILES),)'#010+
+  '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
+  'endif'#010+
+  'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
+  '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
+  '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
+  'ifdef inUni','x'#010+
+  '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  'endif'#010+
+  'ifdef INSTALL_FILES'#010+
+  '        $(MKDIR) $(INSTALL_DATADIR)'#010+
+  '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
+  'endif'#010+
+  #010+
+  'fpc_sourceinstall: distclean'#010+
+  '        $(MK','DIR) $(INSTALL_SOURCEDIR)'#010+
+  '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
+  #010+
+  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
+  'ifdef HASEXAMPLES'#010+
+  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
+  'endif'#010+
+  'ifdef EXAMPLESOURCEFILES'#010+
+  '     ','   $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
+  'endif'#010+
+  'ifdef TARGET_EXAMPLEDIRS'#010+
   '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
-  'AMPLEDIR)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '[distinstallrules]'#013#010+
-  '##############','######################################################'+
-  '#'#013#010+
-  '# Dist Install'#013#010+
-  '#####################################################################'#013+
+  'AMPLEDIR)'#010+
+  'endif'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_distinstall'#013#010+
-  #013#010+
-  'fpc_distinstall: install exampleinstall'#013#010+
-  #013#010+
-  #013#010+
-  '[zipinstallrules]'#013#010+
-  '###','#################################################################'+
-  '#'#013#010+
-  '# Zip'#013#010+
-  '#####################################################################'#013+
-  #010+
-  #013#010+
-  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#013#010+
-  #013#010+
-  '# Temporary path to pac','k a file, can only use a single deep'#013#010+
-  '# subdir, because the deltree can'#039't see the whole tree to remove'#013+
-  #010+
-  'ifndef PACKDIR'#013#010+
-  'ifndef inUnix'#013#010+
-  'PACKDIR=$(BASEDIR)/../fpc-pack'#013#010+
-  'else'#013#010+
-  'PACKDIR=/tmp/fpc-pack'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Maybe create default zipna','me from packagename'#013#010+
-  'ifndef ZIPNAME'#013#010+
-  'ifdef DIST_ZIPNAME'#013#010+
-  'ZIPNAME=$(DIST_ZIPNAME)'#013#010+
-  'else'#013#010+
-  'ZIPNAME=$(PACKAGE_NAME)'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifndef FULLZIPNAME'#013#010+
-  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# ZipTarget'#013#010+
-  'ifnd','ef ZIPTARGET'#013#010+
-  'ifdef DIST_ZIPTARGET'#013#010+
-  'ZIPTARGET=DIST_ZIPTARGET'#013#010+
-  'else'#013#010+
-  'ZIPTARGET=install'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Use tar by default under linux'#013#010+
-  'ifndef USEZIP'#013#010+
-  'ifdef inUnix'#013#010+
-  'USETAR=1'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Use a wrapper script by default for Os/2'#013#010+
-  'ifnd','ef inUnix'#013#010+
-  'USEZIPWRAPPER=1'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# We need to be able to run in the current OS so fix'#013#010+
-  '# the path separator'#013#010+
-  'ifdef USEZIPWRAPPER'#013#010+
-  'ZIPPATHSEP=$(PATHSEP)'#013#010+
-  'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#013+
-  #010+
-  'else'#013#010+
-  'ZIPPAT','HSEP=/'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Create commands to create the zip/tar file'#013#010+
-  'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#013#010+
-  'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#013#010+
-  'ifdef USETAR'#013#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#013,#010+
-  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#013#010+
-  'else'#013#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#013#010+
-  'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
-  'TFILE) *'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_zipinstall:'#013#010+
-  '        $(MAKE) $(ZI','PTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#013+
-  #010+
-  '        $(MKDIR) $(DIST_DESTDIR)'#013#010+
-  '        $(DEL) $(ZIPDESTFILE)'#013#010+
-  'ifdef USEZIPWRAPPER'#013#010+
-  '# Handle gecho separate as we need to espace \ with \\'#013#010+
-  'ifneq ($(ECHOREDIR),echo)'#013#010+
-  '        $(ECHOREDIR) -','e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+
-  'PER)'#013#010+
-  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
-  #013#010+
-  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
-  'ER)'#013#010+
-  'else'#013#010+
-  '        echo $(ZIPCMD_CDPACK) > $(Z','IPWRAPPER)'#013#010+
-  '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#013#010+
-  '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#013#010+
-  'endif'#013#010+
-  'ifdef inUnix'#013#010+
-  '        /bin/sh $(ZIPWRAPPER)'#013#010+
-  'else'#013#010+
-  '        $(ZIPWRAPPER)'#013#010+
-  'endif'#013#010+
-  '        $(DEL) $(ZIPWRAPPER)'#013#010+
-  'else'#013#010+
-  '        $(Z','IPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#013#010+
-  'endif'#013#010+
-  '        $(DELTREE) $(PACKDIR)'#013#010+
-  #013#010+
-  'fpc_zipsourceinstall:'#013#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
-  'SOURCESUFFIX)'#013#010+
-  #013#010+
-  'fpc_zipexampleinstall:'#013#010+
-  'ifdef HASEXAMPLE','S'#013#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
-  'PEXAMPLESUFFIX)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_zipdistinstall:'#013#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#013#010+
-  #013#010+
-  #013#010+
-  '[cleanrules]'#013#010+
+  '[distinstallrules]'#010+
   '################################################','####################'+
-  '#'#013#010+
-  '# Clean rules'#013#010+
-  '#####################################################################'#013+
+  '#'#010+
+  '# Dist Install'#010+
+  '#####################################################################'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#013#010+
-  #013#010+
-  'ifdef EXEFILES'#013#010+
-  'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE','FIL'+
-  'ES))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef CLEAN_UNITS'#013#010+
-  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'ifdef CLEANPPUFILES'#013#010+
-  'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
-  ') $(addprefix $(STATICLIBPREFIX),$(subst',' $(PPUEXT),$(STATICLIBEXT),$'+
-  '(CLEANPPUFILES)))'#013#010+
-  'ifdef DEBUGSYMEXT'#013#010+
+  '.PHONY: fpc_distinstall'#010+
+  #010+
+  'fpc_distinstall: install exampleinstall'#010+
+  #010+
+  #010+
+  '[zipinstallrules]'#010+
+  '###############################################','#####################'+
+  '#'#010+
+  '# Zip'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
+  #010+
+  '# Temporary path to pack a file, can only use a single deep'#010+
+  '# subdir, bec','ause the deltree can'#039't see the whole tree to remove'+
+  #010+
+  'ifndef PACKDIR'#010+
+  'ifndef inUnix'#010+
+  'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
+  'else'#010+
+  'PACKDIR=/tmp/fpc-pack'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Maybe create default zipname from packagename'#010+
+  'ifndef ZIPNAME'#010+
+  'ifdef DIST_ZIPNAME'#010+
+  'ZIPNAM','E=$(DIST_ZIPNAME)'#010+
+  'else'#010+
+  'ZIPNAME=$(PACKAGE_NAME)'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  'ifndef FULLZIPNAME'#010+
+  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
+  'endif'#010+
+  #010+
+  '# ZipTarget'#010+
+  'ifndef ZIPTARGET'#010+
+  'ifdef DIST_ZIPTARGET'#010+
+  'ZIPTARGET=DIST_ZIPTARGET'#010+
+  'else'#010+
+  'ZIPTARGET=','install'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Use tar by default under linux'#010+
+  'ifndef USEZIP'#010+
+  'ifdef inUnix'#010+
+  'USETAR=1'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Use a wrapper script by default for Os/2'#010+
+  'ifndef inUnix'#010+
+  'USEZIPWRAPPER=1'#010+
+  'endif'#010+
+  #010+
+  '# We need to be able to run in the current OS so fix'#010+
+  '# th','e path separator'#010+
+  'ifdef USEZIPWRAPPER'#010+
+  'ZIPPATHSEP=$(PATHSEP)'#010+
+  'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
+  'else'#010+
+  'ZIPPATHSEP=/'#010+
+  'endif'#010+
+  #010+
+  '# Create commands to create the zip/tar file'#010+
+  'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP)',',$(PACKDIR))'#010+
+  'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
+  'ifdef USETAR'#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
+  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
+  'else'#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEX','T)'#010+
+  'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
+  'TFILE) *'#010+
+  'endif'#010+
+  #010+
+  'fpc_zipinstall:'#010+
+  '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
+  '        $(MKDIR) $(DIST_DESTDIR)'#010+
+  '        $(DEL) $(ZIPDESTFILE)'#010+
+  'ifde','f USEZIPWRAPPER'#010+
+  '# Handle gecho separate as we need to espace \ with \\'#010+
+  'ifneq ($(ECHOREDIR),echo)'#010+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
+  'R)'#010+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)',
+  #010+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
+  'ER)'#010+
+  'else'#010+
+  '        echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
+  '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
+  '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
+  'endif'#010+
+  'ifdef inUnix'#010+
+  '    ','    /bin/sh $(ZIPWRAPPER)'#010+
+  'else'#010+
+  '        $(ZIPWRAPPER)'#010+
+  'endif'#010+
+  '        $(DEL) $(ZIPWRAPPER)'#010+
+  'else'#010+
+  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
+  'endif'#010+
+  '        $(DELTREE) $(PACKDIR)'#010+
+  #010+
+  'fpc_zipsourceinstall:'#010+
+  '        $(MAKE) fpc_zipinsta','ll ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+
+  'IPSOURCESUFFIX)'#010+
+  #010+
+  'fpc_zipexampleinstall:'#010+
+  'ifdef HASEXAMPLES'#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
+  'PEXAMPLESUFFIX)'#010+
+  'endif'#010+
+  #010+
+  'fpc_zipdistinstall:'#010+
+  '        $(MAKE) fpc_zipinstal','l ZIPTARGET=distinstall'#010+
+  #010+
+  #010+
+  '[cleanrules]'#010+
+  '#####################################################################'#010+
+  '# Clean rules'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
+  #010,
+  'ifdef EXEFILES'#010+
+  'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
+  '))'#010+
+  'endif'#010+
+  #010+
+  'ifdef CLEAN_UNITS'#010+
+  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
+  'endif'#010+
+  #010+
+  'ifdef CLEANPPUFILES'#010+
+  'override CLEANPPULINKFILES:=$(subst $(','PPUEXT),$(OEXT),$(CLEANPPUFILE'+
+  'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
+  '(CLEANPPUFILES)))'#010+
+  'ifdef DEBUGSYMEXT'#010+
   'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
-  'UFILES))'#013#010+
-  'endif'#013#010+
-  'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
-  'ILES))'#013#010+
-  'override ','CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
-  'EFIX),$(CLEANPPULINKFILES)))'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_clean: $(CLEANTARGET)'#013#010+
-  'ifdef CLEANEXEFILES'#013#010+
-  '        -$(DEL) $(CLEANEXEFILES)'#013#010+
-  'endif'#013#010+
-  'ifdef CLEANPPUFILES'#013#010+
-  '        -$(DEL) $(CLEANPPUFILES)',#013#010+
-  'endif'#013#010+
-  'ifneq ($(CLEANPPULINKFILES),)'#013#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#013#010+
-  'endif'#013#010+
-  'ifdef CLEANRSTFILES'#013#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#013+
+  'UFILES))'#010+
+  'endif'#010+
+  'override CLEANPPUFI','LES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+
+  'UFILES))'#010+
+  'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
+  'IX),$(CLEANPPULINKFILES)))'#010+
+  'endif'#010+
   #010+
-  'endif'#013#010+
-  'ifdef CLEAN_FILES'#013#010+
-  '        -$(DEL) $(CLEAN_FILES)'#013#010+
-  'endif'#013,#010+
-  'ifdef LIB_NAME'#013#010+
-  '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#013#010+
-  'endif'#013#010+
+  'fpc_clean: $(CLEANTARGET)'#010+
+  'ifdef CLEANEXEFILES'#010+
+  '        -$(DEL) $(CLEANEXEFILES)',#010+
+  'endif'#010+
+  'ifdef CLEANPPUFILES'#010+
+  '        -$(DEL) $(CLEANPPUFILES)'#010+
+  'endif'#010+
+  'ifneq ($(CLEANPPULINKFILES),)'#010+
+  '        -$(DEL) $(CLEANPPULINKFILES)'#010+
+  'endif'#010+
+  'ifdef CLEANRSTFILES'#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
+  'endif'#010+
+  'ifdef ','CLEAN_FILES'#010+
+  '        -$(DEL) $(CLEAN_FILES)'#010+
+  'endif'#010+
+  'ifdef LIB_NAME'#010+
+  '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
+  'endif'#010+
   '        -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
-  'PCEXTFILE) $(REDIRFILE)'#013#010+
-  '        -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#013#010+
-  #013#010+
-  'fpc_cleanall: $(CLEANTARGET)',#013#010+
-  'ifdef CLEANEXEFILES'#013#010+
-  '        -$(DEL) $(CLEANEXEFILES)'#013#010+
-  'endif'#013#010+
-  'ifdef COMPILER_UNITTARGETDIR'#013#010+
-  'ifdef CLEANPPUFILES'#013#010+
-  '        -$(DEL) $(CLEANPPUFILES)'#013#010+
-  'endif'#013#010+
-  'ifneq ($(CLEANPPULINKFILES),)'#013#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#013#010+
-  'endif'#013#010+
-  'ifdef CL','EANRSTFILES'#013#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#013+
+  'PCEXTFILE) $(REDIRFILE)'#010+
+  '        -$(DEL) *$(ASMEXT) *_ppa','s$(BATCHEXT)'#010+
   #010+
-  'endif'#013#010+
-  'endif'#013#010+
-  '        -$(DELTREE) units'#013#010+
+  'fpc_cleanall: $(CLEANTARGET)'#010+
+  'ifdef CLEANEXEFILES'#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#010+
+  'endif'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
+  'ifdef CLEANPPUFILES'#010+
+  '        -$(DEL) $(CLEANPPUFILES)'#010+
+  'endif'#010+
+  'ifneq ($(CLEANPPULINKFILES),)'#010+
+  '        -$(DEL) $(CL','EANPPULINKFILES)'#010+
+  'endif'#010+
+  'ifdef CLEANRSTFILES'#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
+  'endif'#010+
+  'endif'#010+
+  '        -$(DELTREE) units'#010+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
-  'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#013#010+
-  'ifneq ($(PPU','EXT),.ppu)'#013#010+
-  '        -$(DEL) *.o *.ppu *.a'#013#010+
-  'endif'#013#010+
-  '        -$(DELTREE) *$(SMARTEXT)'#013#010+
+  'EXT) *$(SHAREDLIBEXT',') *$(PPLEXT)'#010+
+  'ifneq ($(PPUEXT),.ppu)'#010+
+  '        -$(DEL) *.o *.ppu *.a'#010+
+  'endif'#010+
+  '        -$(DELTREE) *$(SMARTEXT)'#010+
   '        -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
-  'CEXTFILE) $(REDIRFILE)'#013#010+
-  '        -$(DEL) *_ppas$(BATCHEXT)'#013#010+
-  'ifdef AOUTEXT'#013#010+
-  '        -$(D','EL) *$(AOUTEXT)'#013#010+
-  'endif'#013#010+
-  'ifdef DEBUGSYMEXT'#013#010+
-  '        -$(DEL) *$(DEBUGSYMEXT)'#013#010+
-  'endif'#013#010+
-  #013#010+
-  'fpc_distclean: cleanall'#013#010+
-  #013#010+
-  #013#010+
-  '[baseinforules]'#013#010+
-  '#####################################################################'#013+
+  'CEXTFILE) $(REDIRFILE)'#010+
+  '        -$(DEL) *_ppas$(BATCHEXT)'#010+
+  'ifdef AO','UTEXT'#010+
+  '        -$(DEL) *$(AOUTEXT)'#010+
+  'endif'#010+
+  'ifdef DEBUGSYMEXT'#010+
+  '        -$(DEL) *$(DEBUGSYMEXT)'#010+
+  'endif'#010+
   #010+
-  '# Base info rules'#013#010+
-  '###################','#################################################'+
-  '#'#013#010+
-  #013#010+
-  '.PHONY: fpc_baseinfo'#013#010+
-  #013#010+
-  'override INFORULES+=fpc_baseinfo'#013#010+
-  #013#010+
-  'fpc_baseinfo:'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Package info =='#013#010+
-  '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#013#010+
-  '  ','      @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Configuration info =='#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  FPC.......... $(FPC)'#013#010+
-  '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#013#010+
-  '        @$(ECHO)  ','Source CPU... $(CPU_SOURCE)'#013#010+
-  '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#013#010+
-  '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#013#010+
-  '        @$(ECHO)  Target OS.... $(OS_TARGET)'#013#010+
-  '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#013#010+
-  '        @$(ECHO)  Full T','arget.. $(FULL_TARGET)'#013#010+
-  '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#013#010+
-  '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Directory info =='#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Required pkgs... $(REQUI','RE_PACKAGES)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#013#010+
-  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#013#010+
-  '        @$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#013#010+
-  '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#013#010+
-  '        @$(ECHO)','  PackagesDir..... $(PACKAGESDIR)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#013#010+
-  '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Tools info =='#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO',')  As........ $(AS)'#013#010+
-  '        @$(ECHO)  Ld........ $(LD)'#013#010+
-  '        @$(ECHO)  Ar........ $(AR)'#013#010+
-  '        @$(ECHO)  Rc........ $(RC)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Mv........ $(MVPROG)'#013#010+
-  '        @$(ECHO)  Cp........ $(CPPROG)'#013#010+
-  '        @$(EC','HO)  Rm........ $(RMPROG)'#013#010+
-  '        @$(ECHO)  GInstall.. $(GINSTALL)'#013#010+
-  '        @$(ECHO)  Echo...... $(ECHO)'#013#010+
-  '        @$(ECHO)  Shell..... $(SHELL)'#013#010+
-  '        @$(ECHO)  Date...... $(DATE)'#013#010+
-  '        @$(ECHO)  FPCMake... $(FPCMAKE)'#013#010+
-  '        @$(ECHO',')  PPUMove... $(PPUMOVE)'#013#010+
-  '        @$(ECHO)  Upx....... $(UPXPROG)'#013#010+
-  '        @$(ECHO)  Zip....... $(ZIPPROG)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Object info =='#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#013,#010+
-  '        @$(ECHO)  Target Units.......... $(TARGET_UNITS)'#013#010+
-  '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#013#010+
-  '        @$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#013#010+
-  '        @$(ECHO)  Target Dirs........... $(TARGET_DIRS',')'#013#010+
-  '        @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#013#010+
-  '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#013#010+
-  '        @$(ECHO)  Clean Files......... ','$(CLEAN_FILES)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#013#010+
-  '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  == Install info =='#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  ','DateStr.............. $(DATESTR)'#013#010+
-  '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#013#010+
-  '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#013#010+
-  '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#013#010+
-  '        @$(ECHO)  ZipSuffix............ $','(ZIPSUFFIX)'#013#010+
-  '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#013#010+
-  '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#013#010+
-  '        @$(ECHO)  Install bina','ry dir... $(INSTALL_BINDIR)'#013#010+
-  '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#013#010+
-  '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#013#010+
-  '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#013#010+
-  '        @$(ECHO)  Install doc ','dir...... $(INSTALL_DOCDIR)'#013#010+
-  '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#013#010+
-  '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)'#013#010+
-  '        @$(EC','HO)  Dist zip name........ $(DIST_ZIPNAME)'#013#010+
-  '        @$(ECHO)'#013#010+
-  #013#010+
-  '[inforules]'#013#010+
-  '#####################################################################'#013+
+  'fpc_distclean: cleanall'#010+
   #010+
-  '# Info rules'#013#010+
-  '#####################################################################'#013+
   #010+
-  #013#010+
-  '.PHON','Y: fpc_info'#013#010+
-  #013#010+
-  'fpc_info: $(INFORULES)'#013#010+
-  #013#010+
-  '[makefilerules]'#013#010+
-  '#####################################################################'#013+
+  '[baseinforules]'#010+
+  '#####################################################################'#010+
+  '# Base info rules'#010+
+  '#############','#######################################################'+
+  '#'#010+
   #010+
-  '# Rebuild Makefile'#013#010+
-  '#####################################################################'#013+
+  '.PHONY: fpc_baseinfo'#010+
   #010+
-  #013#010+
-  '.PHONY: fpc_makefi','le fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
-  'b2 \'#013#010+
-  '        fpc_makefile_dirs'#013#010+
-  #013#010+
-  'fpc_makefile:'#013#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#013#010+
-  #013#010+
-  'fpc_makefile_sub1:'#013#010+
-  'ifdef TARGET_DIRS'#013#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix',' /Makefile.fpc,$(TAR'+
-  'GET_DIRS))'#013#010+
-  'endif'#013#010+
-  'ifdef TARGET_EXAMPLEDIRS'#013#010+
+  'override INFORULES+=fpc_baseinfo'#010+
+  #010+
+  'fpc_baseinfo:'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Package info =='#010+
+  '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
+  '      ','  @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Configuration info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  FPC.......... $(FPC)'#010+
+  '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#010+
+  '        @$(ECHO)  Source CPU','... $(CPU_SOURCE)'#010+
+  '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#010+
+  '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#010+
+  '        @$(ECHO)  Target OS.... $(OS_TARGET)'#010+
+  '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#010+
+  '        @$(ECHO)  Full Target.. $(FULL_','TARGET)'#010+
+  '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#010+
+  '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Directory info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
+  '        ','@$(ECHO)'#010+
+  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
+  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
+  '        @$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#010+
+  '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
+  '        @$(ECHO)  PackagesDir..... $(PACKAG','ESDIR)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
+  '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Tools info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  As........ $(AS)'#010+
+  '        @$(ECH','O)  Ld........ $(LD)'#010+
+  '        @$(ECHO)  Ar........ $(AR)'#010+
+  '        @$(ECHO)  Rc........ $(RC)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Mv........ $(MVPROG)'#010+
+  '        @$(ECHO)  Cp........ $(CPPROG)'#010+
+  '        @$(ECHO)  Rm........ $(RMPROG)'#010+
+  '        @$(ECHO',')  GInstall.. $(GINSTALL)'#010+
+  '        @$(ECHO)  Echo...... $(ECHO)'#010+
+  '        @$(ECHO)  Shell..... $(SHELL)'#010+
+  '        @$(ECHO)  Date...... $(DATE)'#010+
+  '        @$(ECHO)  FPCMake... $(FPCMAKE)'#010+
+  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
+  '        @$(ECHO)  Upx.','...... $(UPXPROG)'#010+
+  '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Object info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#010+
+  '        @$(ECHO)  Target Units.......... $(TARGET_UNI','TS)'#010+
+  '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
+  '        @$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#010+
+  '        @$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
+  '        @$(ECHO)  Target Examples....... $(TARGET_EXAMP','LES)'#010+
+  '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#010+
+  '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Install Unit','s....... $(INSTALL_UNITS)'#010+
+  '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Install info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
+  '        @$(ECHO)  ZipName...........','... $(ZIPNAME)'#010+
+  '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
+  '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
+  '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
+  '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#010+
+  '      ','  @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
+  '        @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
+  '        @$(ECHO)  Install library dir.. $(INSTALL_','LIBDIR)'#010+
+  '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#010+
+  '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#010+
+  '        @$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
+  '        @$(ECHO)  Install example dir.. $(INSTALL_EXAM','PLEDIR)'#010+
+  '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)'#010+
+  '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
+  '        @$(ECHO)'#010+
+  #010+
+  '[inforules]'#010+
+  '##############','######################################################'+
+  '#'#010+
+  '# Info rules'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_info'#010+
+  #010+
+  'fpc_info: $(INFORULES)'#010+
+  #010+
+  '[makefilerules]'#010+
+  '##########################################','##########################'+
+  '#'#010+
+  '# Rebuild Makefile'#010+
+  '#####################################################################'#010+
+  #010+
+  '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
+  ' \'#010+
+  '        fpc_makefile_dirs'#010+
+  #010+
+  'fpc_makefile:'#010+
+  '        ','$(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
+  #010+
+  'fpc_makefile_sub1:'#010+
+  'ifdef TARGET_DIRS'#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
-  'T_EXAMPLEDIRS))'#013#010+
-  'endif'#013#010+
-  #013#010+
+  'T_DIRS))'#010+
+  'endif'#010+
+  'ifdef TARGET_EXAMPLEDIRS'#010+
+  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /','Makefile.fpc,$(TAR'+
+  'GET_EXAMPLEDIRS))'#010+
+  'endif'#010+
+  #010+
   'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
-  'EXAMPLEDI','RS))'#013#010+
-  #013#010+
-  'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#013#010+
-  #013#010+
-  'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#013#010+
-  #013#010+
-  '[localmakefile]'#013#010+
-  '#####################################################################'#013+
+  'EXAMPLEDIRS))'#010+
   #010+
-  '# Local Makefile'#013#010+
-  '###################','#################################################'+
-  '#'#013#010+
-  #013#010+
-  'ifneq ($(wildcard fpcmake.loc),)'#013#010+
-  'include fpcmake.loc'#013#010+
-  'endif'#013#010+
-  #013#010+
-  #013#010+
-  '[userrules]'#013#010+
-  '#####################################################################'#013+
+  'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
   #010+
-  '# Users rules'#013#010+
-  '#####################','###############################################'+
-  '#'#013#010+
-  #013#010+
-  '[lclrules]'#013#010+
-  '#####################################################################'#013+
+  'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
   #010+
-  '# LCL Rules'#013#010+
-  '#####################################################################'#013+
+  '[localmak','efile]'#010+
+  '#####################################################################'#010+
+  '# Local Makefile'#010+
+  '#####################################################################'#010+
   #010+
-  #013#010+
-  '# LCL Platform'#013#010+
-  'ifn','def LCL_PLATFORM'#013#010+
-  'ifeq ($(OS_TARGET),win32)'#013#010+
-  'LCL_PLATFORM=win32'#013#010+
-  'else'#013#010+
-  'LCL_PLATFORM=gtk'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  'export LCL_PLATFORM'#013#010+
-  #013#010+
-  '# Check if the specified LCLDIR is correct'#013#010+
-  'ifdef LCLDIR'#013#010+
-  'override LCLDIR:=$(subst \,/,$(LCLDIR))'#013#010+
-  'ifeq ($(wildcar','d $(LCLDIR)/units/$(LCL_PLATFORM)),)'#013#010+
-  'override LCLDIR=wrong'#013#010+
-  'endif'#013#010+
-  'else'#013#010+
-  'override LCLDIR=wrong'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Check if the default LCLDIR is correct'#013#010+
-  'ifdef DEFAULT_LCLDIR'#013#010+
-  'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#013#010+
-  'ifeq ($(wildcard $(LC','LDIR)/units/$(LCL_PLATFORM)),)'#013#010+
-  'override LCLDIR=wrong'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Check for development version'#013#010+
-  'ifeq ($(LCLDIR),wrong)'#013#010+
-  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /units/$(LCL_PLATFORM),$(BASE','DIR)/lcl $(BASEDIR)))))'#013+
+  'ifneq ($(wildcard fpcmake.loc),)'#010+
+  'include fpcmake.loc'#010+
+  'endif'#010+
   #010+
-  'ifeq ($(LCLDIR),)'#013#010+
-  'override LCLDIR=wrong'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Check for release version'#013#010+
-  'ifeq ($(LCLDIR),wrong)'#013#010+
-  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /lib/lazarus/units/$(','LCL_PLATFORM),/usr/local /usr))))'#013+
   #010+
-  'ifeq ($(LCLDIR),)'#013#010+
-  'override LCLDIR=wrong'#013#010+
-  'endif'#013#010+
-  'endif'#013#010+
-  #013#010+
-  '# Generate dirs'#013#010+
+  '[userrules]'#010+
+  '##','##################################################################'+
+  '#'#010+
+  '# Users rules'#010+
+  '#####################################################################'#010+
+  #010+
+  '[lclrules]'#010+
+  '#####################################################################'#010+
+  '# LCL ','Rules'#010+
+  '#####################################################################'#010+
+  #010+
+  '# LCL Platform'#010+
+  'ifndef LCL_PLATFORM'#010+
+  'ifeq ($(OS_TARGET),win32)'#010+
+  'LCL_PLATFORM=win32'#010+
+  'else'#010+
+  'LCL_PLATFORM=gtk'#010+
+  'endif'#010+
+  'endif'#010+
+  'export LCL_PLATFORM'#010+
+  #010+
+  '# Check if the specified LCL','DIR is correct'#010+
+  'ifdef LCLDIR'#010+
+  'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
+  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
+  'override LCLDIR=wrong'#010+
+  'endif'#010+
+  'else'#010+
+  'override LCLDIR=wrong'#010+
+  'endif'#010+
+  #010+
+  '# Check if the default LCLDIR is correct'#010+
+  'ifdef DEFAULT_LCL','DIR'#010+
+  'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
+  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
+  'override LCLDIR=wrong'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Check for development version'#010+
+  'ifeq ($(LCLDIR),wrong)'#010+
+  'override LCLDIR=$(subst /units/$(LCL_PLATFORM)',',,$(firstword $(wildca'+
+  'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
+  'ifeq ($(LCLDIR),)'#010+
+  'override LCLDIR=wrong'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Check for release version'#010+
+  'ifeq ($(LCLDIR),wrong)'#010+
+  'override LCLDIR=$(subst /units/$(LCL_PLATFORM)',',,$(firstword $(wildca'+
+  'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
+  'ifeq ($(LCLDIR),)'#010+
+  'override LCLDIR=wrong'#010+
+  'endif'#010+
+  'endif'#010+
+  #010+
+  '# Generate dirs'#010+
   'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
-  'IR)/units)'#013#010+
-  'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.','. $(LCLDIR)/../compo'+
-  'nents $(LCLDIR)/components)'#013#010+
-  'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#013#010+
-  #013#010+
-  '# Add LCL dirs to paths'#013#010+
-  'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#013#010+
-  'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#013#010+
-  #013#010+
-  '[lclinforules]'#013#010+
-  '############','########################################################'+
-  '#'#013#010+
-  '# LCL Info rules'#013#010+
-  '#####################################################################'#013+
+  'IR)/units',')'#010+
+  'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
+  'nts $(LCLDIR)/components)'#010+
+  'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
   #010+
-  'override INFORULES+=lclinfo'#013#010+
-  #013#010+
-  '.PHONY: lclinfo'#013#010+
-  #013#010+
-  'lclinfo:'#013#010+
-  '        @$(ECHO)  == LCL info ==',#013#010+
-  '        @$(ECHO)'#013#010+
-  '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#013#010+
-  '        @$(ECHO)  LCLDIR............... $(LCLDIR)'#013#010+
-  '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#013#010+
-  '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR',')'#013#010+
-  '        @$(ECHO)'#013#010
+  '# Add LCL dirs to paths'#010+
+  'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
+  'override COMPILER_UNITDIR+=','$(LCLUNITDIR)'#010+
+  #010+
+  '[lclinforules]'#010+
+  '#####################################################################'#010+
+  '# LCL Info rules'#010+
+  '#####################################################################'#010+
+  'override INFORULES+=lclinfo'#010+
+  #010+
+  '.PHONY: lclinfo'#010+
+  #010+
+  'lclinfo',':'#010+
+  '        @$(ECHO)  == LCL info =='#010+
+  '        @$(ECHO)'#010+
+  '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#010+
+  '        @$(ECHO)  LCLDIR............... $(LCLDIR)'#010+
+  '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
+  '        @$(ECHO)  LCL Compon','ent dir.... $(LCLCOMPONENTDIR)'#010+
+  '        @$(ECHO)'#010
 );
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index cef1c6585c..87f6f02e1b 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -1277,7 +1277,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile
index b455c4dffb..12bf20fb34 100644
--- a/utils/fpcres/Makefile
+++ b/utils/fpcres/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1474,7 +1474,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile
index 7d36de00b3..541ae2fbfd 100644
--- a/utils/fpdoc/Makefile
+++ b/utils/fpdoc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2141,7 +2141,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile
index 9d1772982f..6fd3305914 100644
--- a/utils/fpmc/Makefile
+++ b/utils/fpmc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -2260,7 +2260,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile
index 0e1694d285..eaaab473b9 100644
--- a/utils/fprcp/Makefile
+++ b/utils/fprcp/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1363,7 +1363,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile
index c729c4fc52..f9f6605b77 100644
--- a/utils/h2pas/Makefile
+++ b/utils/h2pas/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1474,7 +1474,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif
diff --git a/utils/tply/Makefile b/utils/tply/Makefile
index eb080098e7..1f75f63b8c 100644
--- a/utils/tply/Makefile
+++ b/utils/tply/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/15]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1587,7 +1587,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1
+FPCCPUOPT:=-O1r
 else
 FPCCPUOPT:=
 endif