Merged revisions 11180 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r11180 | giulio | 2008-06-03 16:01:09 +0200 (mar, 03 giu 2008) | 3 lines
  
  * fixed fpc_zipinstall for go32v2 and the like
  * makefiles regenerated
........


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/rc_2_2_2@11182 3ad0048d-3df7-0310-abae-a5850022a9f2

162 files changed, 2446 insertions, 2446 deletions

diff --git a/Makefile b/Makefile
index 004441d52b..29701e96f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -1583,7 +1583,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/compiler/Makefile b/compiler/Makefile
index e4aaaabbbc..2a1daa8a34 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2763,7 +2763,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile
index f54b0dfb28..d1bdedd59b 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/ide/Makefile b/ide/Makefile
index 7ff3643a0e..a054662a10 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2465,7 +2465,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/ide/compiler/Makefile b/ide/compiler/Makefile
index b745e0fac7..1581790fa2 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/installer/Makefile b/installer/Makefile
index 8e0009ce15..8f91b2523a 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2172,7 +2172,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/Makefile b/packages/Makefile
index 60817958dd..339deb6edf 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/a52/Makefile b/packages/a52/Makefile
index a27a59e25c..bafec46788 100644
--- a/packages/a52/Makefile
+++ b/packages/a52/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/amunits/Makefile b/packages/amunits/Makefile
index 04e6e6b4c5..49acf3a607 100644
--- a/packages/amunits/Makefile
+++ b/packages/amunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile
index 9bbc7f57a9..4bc991b060 100644
--- a/packages/aspell/Makefile
+++ b/packages/aspell/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile
index e04116789c..7c67ff047d 100644
--- a/packages/bfd/Makefile
+++ b/packages/bfd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2115,7 +2115,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile
index 75b347b997..226a7c2639 100644
--- a/packages/cairo/Makefile
+++ b/packages/cairo/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2676,7 +2676,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/cdrom/Makefile b/packages/cdrom/Makefile
index 6deb4643f8..af26229a17 100644
--- a/packages/cdrom/Makefile
+++ b/packages/cdrom/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2332,7 +2332,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/chm/Makefile b/packages/chm/Makefile
index f7a88b2e99..1a1e77cadc 100644
--- a/packages/chm/Makefile
+++ b/packages/chm/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2528,7 +2528,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile
index 5156510836..f76c7852bd 100644
--- a/packages/dbus/Makefile
+++ b/packages/dbus/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/dbus/examples/Makefile b/packages/dbus/examples/Makefile
index 66db865bc5..2b20b6e40c 100644
--- a/packages/dbus/examples/Makefile
+++ b/packages/dbus/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/dts/Makefile b/packages/dts/Makefile
index 91d4c313ce..0f86b2061f 100644
--- a/packages/dts/Makefile
+++ b/packages/dts/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile
index 3e43e7ca01..e9b97beca0 100644
--- a/packages/fcl-async/Makefile
+++ b/packages/fcl-async/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile
index 686466c9f6..9fd24588a9 100644
--- a/packages/fcl-base/Makefile
+++ b/packages/fcl-base/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2529,7 +2529,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile
index a47dc79a0b..33afe2be8e 100644
--- a/packages/fcl-db/Makefile
+++ b/packages/fcl-db/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2312,7 +2312,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-db/src/base/Makefile b/packages/fcl-db/src/base/Makefile
index 39096ec426..2d91bed191 100644
--- a/packages/fcl-db/src/base/Makefile
+++ b/packages/fcl-db/src/base/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/codegen/Makefile b/packages/fcl-db/src/codegen/Makefile
index f15362d472..35d82f4bec 100644
--- a/packages/fcl-db/src/codegen/Makefile
+++ b/packages/fcl-db/src/codegen/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/datadict/Makefile b/packages/fcl-db/src/datadict/Makefile
index 928a39adbf..14b61198e9 100644
--- a/packages/fcl-db/src/datadict/Makefile
+++ b/packages/fcl-db/src/datadict/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/dbase/Makefile b/packages/fcl-db/src/dbase/Makefile
index 60de66fb5b..8030184cc0 100644
--- a/packages/fcl-db/src/dbase/Makefile
+++ b/packages/fcl-db/src/dbase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/export/Makefile b/packages/fcl-db/src/export/Makefile
index 23f3de45a2..b61c1a6fbc 100644
--- a/packages/fcl-db/src/export/Makefile
+++ b/packages/fcl-db/src/export/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/memds/Makefile b/packages/fcl-db/src/memds/Makefile
index ceffd0b5f8..c252efe259 100644
--- a/packages/fcl-db/src/memds/Makefile
+++ b/packages/fcl-db/src/memds/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/paradox/Makefile b/packages/fcl-db/src/paradox/Makefile
index 2be3789206..bfde7d7000 100644
--- a/packages/fcl-db/src/paradox/Makefile
+++ b/packages/fcl-db/src/paradox/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sdf/Makefile b/packages/fcl-db/src/sdf/Makefile
index a8e219edd0..074010b561 100644
--- a/packages/fcl-db/src/sdf/Makefile
+++ b/packages/fcl-db/src/sdf/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/Makefile b/packages/fcl-db/src/sqldb/Makefile
index 5d77ebc0cf..bb516d9d5b 100644
--- a/packages/fcl-db/src/sqldb/Makefile
+++ b/packages/fcl-db/src/sqldb/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/interbase/Makefile b/packages/fcl-db/src/sqldb/interbase/Makefile
index 1117c84275..14d6837cb1 100644
--- a/packages/fcl-db/src/sqldb/interbase/Makefile
+++ b/packages/fcl-db/src/sqldb/interbase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile
index c05f98d6b5..d0f596210c 100644
--- a/packages/fcl-db/src/sqldb/mysql/Makefile
+++ b/packages/fcl-db/src/sqldb/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/odbc/Makefile b/packages/fcl-db/src/sqldb/odbc/Makefile
index e6e02ba21b..6e5537e62a 100644
--- a/packages/fcl-db/src/sqldb/odbc/Makefile
+++ b/packages/fcl-db/src/sqldb/odbc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/oracle/Makefile b/packages/fcl-db/src/sqldb/oracle/Makefile
index 536444f300..6eeb048e9b 100644
--- a/packages/fcl-db/src/sqldb/oracle/Makefile
+++ b/packages/fcl-db/src/sqldb/oracle/Makefile
@@ -1,2192 +1,2192 @@
-#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
-#
-default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
-BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx
-LIMIT83fs = go32v2 os2 emx watcom
-OSNeedsComspecToRunBatch = go32v2 watcom
-FORCE:
-.PHONY: FORCE
-override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
-ifneq ($(findstring darwin,$(OSTYPE)),)
-inUnix=1 #darwin
-SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
-else
-ifeq ($(findstring ;,$(PATH)),)
-inUnix=1
-SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
-else
-SEARCHPATH:=$(subst ;, ,$(PATH))
-endif
-endif
-SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
-PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
-ifeq ($(PWD),)
-PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
-ifeq ($(PWD),)
-$(error You need the GNU utils package to use this Makefile)
-else
-PWD:=$(firstword $(PWD))
-SRCEXEEXT=
-endif
-else
-PWD:=$(firstword $(PWD))
-SRCEXEEXT=.exe
-endif
-ifndef inUnix
-ifeq ($(OS),Windows_NT)
-inWinNT=1
-else
-ifdef OS2_SHELL
-inOS2=1
-endif
-endif
-else
-ifneq ($(findstring cygdrive,$(PATH)),)
-inCygWin=1
-endif
-endif
-ifdef inUnix
-SRCBATCHEXT=.sh
-else
-ifdef inOS2
-SRCBATCHEXT=.cmd
-else
-SRCBATCHEXT=.bat
-endif
-endif
-ifdef COMSPEC
-ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
-RUNBATCH=$(COMSPEC) /C
-endif
-endif
-ifdef inUnix
-PATHSEP=/
-else
-PATHSEP:=$(subst /,\,/)
-ifdef inCygWin
-PATHSEP=/
-endif
-endif
-ifdef PWD
-BASEDIR:=$(subst \,/,$(shell $(PWD)))
-ifdef inCygWin
-ifneq ($(findstring /cygdrive/,$(BASEDIR)),)
-BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))
-BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))
-BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))
-endif
-endif
-else
-BASEDIR=.
-endif
-ifdef inOS2
-ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ECHO),)
-ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ECHO),)
-ECHO=echo
-else
-ECHO:=$(firstword $(ECHO))
-endif
-else
-ECHO:=$(firstword $(ECHO))
-endif
-endif
-export ECHO
-endif
-override DEFAULT_FPCDIR=../../../../..
-ifndef FPC
-ifdef PP
-FPC=$(PP)
-endif
-endif
-ifndef FPC
-FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(FPCPROG),)
-FPCPROG:=$(firstword $(FPCPROG))
-ifneq ($(CPU_TARGET),)
-FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
-else
-FPC:=$(shell $(FPCPROG) -PB)
-endif
-ifneq ($(findstring Error,$(FPC)),)
-override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-endif
-else
-override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-endif
-endif
-override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
-override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
-FOUNDFPC:=$(strip $(wildcard $(FPC)))
-ifeq ($(FOUNDFPC),)
-FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))
-ifeq ($(FOUNDFPC),)
-$(error Compiler $(FPC) not found)
-endif
-endif
-ifndef FPC_COMPILERINFO
-FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
-endif
-ifndef FPC_VERSION
-FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
-endif
-export FPC FPC_VERSION FPC_COMPILERINFO
-unexport CHECKDEPEND ALLDEPENDENCIES
-ifndef CPU_TARGET
-ifdef CPU_TARGET_DEFAULT
-CPU_TARGET=$(CPU_TARGET_DEFAULT)
-endif
-endif
-ifndef OS_TARGET
-ifdef OS_TARGET_DEFAULT
-OS_TARGET=$(OS_TARGET_DEFAULT)
-endif
-endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
-endif
-ifndef CPU_SOURCE
-CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
-endif
-ifndef CPU_TARGET
-CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
-endif
-ifndef OS_TARGET
-OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
-endif
-FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifeq ($(CPU_TARGET),armeb)
-ARCH=arm
-override FPCOPT+=-Cb
-else
-ifeq ($(CPU_TARGET),armel)
-ARCH=arm
-override FPCOPT+=-CaEABI
-else
-ARCH=$(CPU_TARGET)
-endif
-endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-TARGETSUFFIX=$(OS_TARGET)
-SOURCESUFFIX=$(OS_SOURCE)
-else
-TARGETSUFFIX=$(FULL_TARGET)
-SOURCESUFFIX=$(FULL_SOURCE)
-endif
-ifeq  ($(OS_TARGET),darwin)
-ifneq ($(OS_SOURCE),darwin)
-CROSSCOMPILE=1
-endif
-else
-ifneq ($(FULL_TARGET),$(FULL_SOURCE))
-CROSSCOMPILE=1
-endif
-endif
-ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
-ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
-$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
-endif
-endif
-ifneq ($(findstring $(OS_TARGET),$(BSDs)),)
-BSDhier=1
-endif
-ifeq ($(OS_TARGET),linux)
-linuxHier=1
-endif
-export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
-ifdef FPCDIR
-override FPCDIR:=$(subst \,/,$(FPCDIR))
-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
-override FPCDIR=wrong
-endif
-else
-override FPCDIR=wrong
-endif
-ifdef DEFAULT_FPCDIR
-ifeq ($(FPCDIR),wrong)
-override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
-override FPCDIR=wrong
-endif
-endif
-endif
-ifeq ($(FPCDIR),wrong)
-ifdef inUnix
-override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
-ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
-endif
-else
-override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
-override FPCDIR:=$(FPCDIR)/..
-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
-override FPCDIR:=$(FPCDIR)/..
-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
-override FPCDIR:=$(BASEDIR)
-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
-override FPCDIR=c:/pp
-endif
-endif
-endif
-endif
-endif
-ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
-endif
-ifndef BINUTILSPREFIX
-ifndef CROSSBINDIR
-ifdef CROSSCOMPILE
-BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
-endif
-endif
-endif
-UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
-ifeq ($(UNITSDIR),)
-UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
-endif
-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override PACKAGE_NAME=fcl-db
-PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR))))))
-ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=oracleconnection
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=oracleconnection
-endif
-override INSTALL_FPCPACKAGE=y
-ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-S2
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-S2
-endif
-ifdef REQUIRE_UNITSDIR
-override UNITSDIR+=$(REQUIRE_UNITSDIR)
-endif
-ifdef REQUIRE_PACKAGESDIR
-override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)
-endif
-ifdef ZIPINSTALL
-ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)
-UNIXHier=1
-endif
-else
-ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)
-UNIXHier=1
-endif
-endif
-ifndef INSTALL_PREFIX
-ifdef PREFIX
-INSTALL_PREFIX=$(PREFIX)
-endif
-endif
-ifndef INSTALL_PREFIX
-ifdef UNIXHier
-INSTALL_PREFIX=/usr/local
-else
-ifdef INSTALL_FPCPACKAGE
-INSTALL_BASEDIR:=/pp
-else
-INSTALL_BASEDIR:=/$(PACKAGE_NAME)
-endif
-endif
-endif
-export INSTALL_PREFIX
-ifdef INSTALL_FPCSUBDIR
-export INSTALL_FPCSUBDIR
-endif
-ifndef DIST_DESTDIR
-DIST_DESTDIR:=$(BASEDIR)
-endif
-export DIST_DESTDIR
-ifndef COMPILER_UNITTARGETDIR
-ifdef PACKAGEDIR_MAIN
-COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)
-else
-COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)
-endif
-endif
-ifndef COMPILER_TARGETDIR
-COMPILER_TARGETDIR=.
-endif
-ifndef INSTALL_BASEDIR
-ifdef UNIXHier
-ifdef INSTALL_FPCPACKAGE
-INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
-else
-INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)
-endif
-else
-INSTALL_BASEDIR:=$(INSTALL_PREFIX)
-endif
-endif
-ifndef INSTALL_BINDIR
-ifdef UNIXHier
-INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
-else
-INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
-ifdef INSTALL_FPCPACKAGE
-ifdef CROSSCOMPILE
-ifdef CROSSINSTALL
-INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)
-else
-INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
-endif
-else
-INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)
-endif
-endif
-endif
-endif
-ifndef INSTALL_UNITDIR
-INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)
-ifdef INSTALL_FPCPACKAGE
-ifdef PACKAGE_NAME
-INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
-endif
-endif
-endif
-ifndef INSTALL_LIBDIR
-ifdef UNIXHier
-INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
-else
-INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
-endif
-endif
-ifndef INSTALL_SOURCEDIR
-ifdef UNIXHier
-ifdef BSDhier
-SRCPREFIXDIR=share/src
-else
-ifdef linuxHier
-SRCPREFIXDIR=share/src
-else
-SRCPREFIXDIR=src
-endif
-endif
-ifdef INSTALL_FPCPACKAGE
-ifdef INSTALL_FPCSUBDIR
-INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
-else
-INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
-endif
-else
-INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-endif
-else
-ifdef INSTALL_FPCPACKAGE
-ifdef INSTALL_FPCSUBDIR
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
-else
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
-endif
-else
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
-endif
-endif
-endif
-ifndef INSTALL_DOCDIR
-ifdef UNIXHier
-ifdef BSDhier
-DOCPREFIXDIR=share/doc
-else
-ifdef linuxHier
-DOCPREFIXDIR=share/doc
-else
-DOCPREFIXDIR=doc
-endif
-endif
-ifdef INSTALL_FPCPACKAGE
-INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
-else
-INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-endif
-else
-ifdef INSTALL_FPCPACKAGE
-INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)
-else
-INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc
-endif
-endif
-endif
-ifndef INSTALL_EXAMPLEDIR
-ifdef UNIXHier
-ifdef INSTALL_FPCPACKAGE
-ifdef BSDhier
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
-else
-ifdef linuxHier
-INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples
-else
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
-endif
-endif
-else
-ifdef BSDhier
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-else
-ifdef linuxHier
-INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-else
-INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-endif
-endif
-endif
-else
-ifdef INSTALL_FPCPACKAGE
-INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
-else
-INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples
-endif
-endif
-endif
-ifndef INSTALL_DATADIR
-INSTALL_DATADIR=$(INSTALL_BASEDIR)
-endif
-ifndef INSTALL_SHAREDDIR
-INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
-endif
-ifdef CROSSCOMPILE
-ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
-ifeq ($(CROSSBINDIR),)
-CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$(FULL_SOURCE))
-endif
-endif
-else
-CROSSBINDIR=
-endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
-endif
-endif
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
-endif
-export GCCLIBDIR OTHERLIB
-endif
-BATCHEXT=.bat
-LOADEREXT=.as
-EXEEXT=.exe
-PPLEXT=.ppl
-PPUEXT=.ppu
-OEXT=.o
-ASMEXT=.s
-SMARTEXT=.sl
-STATICLIBEXT=.a
-SHAREDLIBEXT=.so
-SHAREDLIBPREFIX=libfp
-STATICLIBPREFIX=libp
-IMPORTLIBPREFIX=libimp
-RSTEXT=.rst
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),go32v1)
-STATICLIBPREFIX=
-SHORTSUFFIX=v1
-endif
-ifeq ($(OS_TARGET),go32v2)
-STATICLIBPREFIX=
-SHORTSUFFIX=dos
-endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-OEXT=.obj
-ASMEXT=.asm
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=wat
-endif
-ifeq ($(OS_TARGET),linux)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=lnx
-endif
-ifeq ($(OS_TARGET),freebsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=fbs
-endif
-ifeq ($(OS_TARGET),netbsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=nbs
-endif
-ifeq ($(OS_TARGET),openbsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=obs
-endif
-ifeq ($(OS_TARGET),win32)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=w32
-endif
-ifeq ($(OS_TARGET),os2)
-BATCHEXT=.cmd
-AOUTEXT=.out
-STATICLIBPREFIX=
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=os2
-ECHO=echo
-endif
-ifeq ($(OS_TARGET),emx)
-BATCHEXT=.cmd
-AOUTEXT=.out
-STATICLIBPREFIX=
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=emx
-ECHO=echo
-endif
-ifeq ($(OS_TARGET),amiga)
-EXEEXT=
-SHAREDLIBEXT=.library
-SHORTSUFFIX=amg
-endif
-ifeq ($(OS_TARGET),morphos)
-EXEEXT=
-SHAREDLIBEXT=.library
-SHORTSUFFIX=mos
-endif
-ifeq ($(OS_TARGET),atari)
-EXEEXT=.ttp
-SHORTSUFFIX=ata
-endif
-ifeq ($(OS_TARGET),beos)
-BATCHEXT=.sh
-EXEEXT=
-SHORTSUFFIX=be
-endif
-ifeq ($(OS_TARGET),haiku)
-BATCHEXT=.sh
-EXEEXT=
-SHORTSUFFIX=hai
-endif
-ifeq ($(OS_TARGET),solaris)
-BATCHEXT=.sh
-EXEEXT=
-SHORTSUFFIX=sun
-endif
-ifeq ($(OS_TARGET),qnx)
-BATCHEXT=.sh
-EXEEXT=
-SHORTSUFFIX=qnx
-endif
-ifeq ($(OS_TARGET),netware)
-EXEEXT=.nlm
-STATICLIBPREFIX=
-SHORTSUFFIX=nw
-endif
-ifeq ($(OS_TARGET),netwlibc)
-EXEEXT=.nlm
-STATICLIBPREFIX=
-SHORTSUFFIX=nwl
-endif
-ifeq ($(OS_TARGET),macos)
-BATCHEXT=
-EXEEXT=
-DEBUGSYMEXT=.xcoff
-SHORTSUFFIX=mac
-endif
-ifeq ($(OS_TARGET),darwin)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=dwn
-endif
-ifeq ($(OS_TARGET),gba)
-EXEEXT=.gba
-SHAREDLIBEXT=.so
-SHORTSUFFIX=gba
-endif
-ifeq ($(OS_TARGET),symbian)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=symbian
-endif
-else
-ifeq ($(OS_TARGET),go32v1)
-PPUEXT=.pp1
-OEXT=.o1
-ASMEXT=.s1
-SMARTEXT=.sl1
-STATICLIBEXT=.a1
-SHAREDLIBEXT=.so1
-STATICLIBPREFIX=
-SHORTSUFFIX=v1
-endif
-ifeq ($(OS_TARGET),go32v2)
-STATICLIBPREFIX=
-SHORTSUFFIX=dos
-endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-SHORTSUFFIX=wat
-endif
-ifeq ($(OS_TARGET),linux)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=lnx
-endif
-ifeq ($(OS_TARGET),freebsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=fbs
-endif
-ifeq ($(OS_TARGET),netbsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=nbs
-endif
-ifeq ($(OS_TARGET),openbsd)
-BATCHEXT=.sh
-EXEEXT=
-HASSHAREDLIB=1
-SHORTSUFFIX=obs
-endif
-ifeq ($(OS_TARGET),win32)
-PPUEXT=.ppw
-OEXT=.ow
-ASMEXT=.sw
-SMARTEXT=.slw
-STATICLIBEXT=.aw
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=w32
-endif
-ifeq ($(OS_TARGET),os2)
-BATCHEXT=.cmd
-PPUEXT=.ppo
-ASMEXT=.so2
-OEXT=.oo2
-AOUTEXT=.out
-SMARTEXT=.sl2
-STATICLIBPREFIX=
-STATICLIBEXT=.ao2
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=os2
-ECHO=echo
-endif
-ifeq ($(OS_TARGET),amiga)
-EXEEXT=
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-SHAREDLIBEXT=.library
-SHORTSUFFIX=amg
-endif
-ifeq ($(OS_TARGET),atari)
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=.ttp
-SHORTSUFFIX=ata
-endif
-ifeq ($(OS_TARGET),beos)
-BATCHEXT=.sh
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-SHORTSUFFIX=be
-endif
-ifeq ($(OS_TARGET),solaris)
-BATCHEXT=.sh
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-SHORTSUFFIX=sun
-endif
-ifeq ($(OS_TARGET),qnx)
-BATCHEXT=.sh
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-SHORTSUFFIX=qnx
-endif
-ifeq ($(OS_TARGET),netware)
-STATICLIBPREFIX=
-PPUEXT=.ppu
-OEXT=.o
-ASMEXT=.s
-SMARTEXT=.sl
-STATICLIBEXT=.a
-SHAREDLIBEXT=.nlm
-EXEEXT=.nlm
-SHORTSUFFIX=nw
-endif
-ifeq ($(OS_TARGET),netwlibc)
-STATICLIBPREFIX=
-PPUEXT=.ppu
-OEXT=.o
-ASMEXT=.s
-SMARTEXT=.sl
-STATICLIBEXT=.a
-SHAREDLIBEXT=.nlm
-EXEEXT=.nlm
-SHORTSUFFIX=nwl
-endif
-ifeq ($(OS_TARGET),macos)
-BATCHEXT=
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-DEBUGSYMEXT=.xcoff
-SHORTSUFFIX=mac
-endif
-endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(SHORTSUFFIX)
-ZIPSUFFIX=$(SHORTSUFFIX)
-ZIPCROSSPREFIX=
-ZIPSOURCESUFFIX=src
-ZIPEXAMPLESUFFIX=exm
-else
-FPCMADE=fpcmade.$(TARGETSUFFIX)
-ZIPSOURCESUFFIX=.source
-ZIPEXAMPLESUFFIX=.examples
-ifdef CROSSCOMPILE
-ZIPSUFFIX=.$(SOURCESUFFIX)
-ZIPCROSSPREFIX=$(TARGETSUFFIX)-
-else
-ZIPSUFFIX=.$(TARGETSUFFIX)
-ZIPCROSSPREFIX=
-endif
-endif
-ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ECHO),)
-ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ECHO),)
-ECHO= __missing_command_ECHO
-else
-ECHO:=$(firstword $(ECHO))
-endif
-else
-ECHO:=$(firstword $(ECHO))
-endif
-endif
-export ECHO
-ifndef DATE
-DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(DATE),)
-DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(DATE),)
-DATE= __missing_command_DATE
-else
-DATE:=$(firstword $(DATE))
-endif
-else
-DATE:=$(firstword $(DATE))
-endif
-endif
-export DATE
-ifndef GINSTALL
-GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(GINSTALL),)
-GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(GINSTALL),)
-GINSTALL= __missing_command_GINSTALL
-else
-GINSTALL:=$(firstword $(GINSTALL))
-endif
-else
-GINSTALL:=$(firstword $(GINSTALL))
-endif
-endif
-export GINSTALL
-ifndef CPPROG
-CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(CPPROG),)
-CPPROG= __missing_command_CPPROG
-else
-CPPROG:=$(firstword $(CPPROG))
-endif
-endif
-export CPPROG
-ifndef RMPROG
-RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(RMPROG),)
-RMPROG= __missing_command_RMPROG
-else
-RMPROG:=$(firstword $(RMPROG))
-endif
-endif
-export RMPROG
-ifndef MVPROG
-MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(MVPROG),)
-MVPROG= __missing_command_MVPROG
-else
-MVPROG:=$(firstword $(MVPROG))
-endif
-endif
-export MVPROG
-ifndef MKDIRPROG
-MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(MKDIRPROG),)
-MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(MKDIRPROG),)
-MKDIRPROG= __missing_command_MKDIRPROG
-else
-MKDIRPROG:=$(firstword $(MKDIRPROG))
-endif
-else
-MKDIRPROG:=$(firstword $(MKDIRPROG))
-endif
-endif
-export MKDIRPROG
-ifndef ECHOREDIR
-ifndef inUnix
-ECHOREDIR=echo
-else
-ECHOREDIR=$(ECHO)
-endif
-endif
-ifndef COPY
-COPY:=$(CPPROG) -fp
-endif
-ifndef COPYTREE
-COPYTREE:=$(CPPROG) -Rfp
-endif
-ifndef MKDIRTREE
-MKDIRTREE:=$(MKDIRPROG) -p
-endif
-ifndef MOVE
-MOVE:=$(MVPROG) -f
-endif
-ifndef DEL
-DEL:=$(RMPROG) -f
-endif
-ifndef DELTREE
-DELTREE:=$(RMPROG) -rf
-endif
-ifndef INSTALL
-ifdef inUnix
-INSTALL:=$(GINSTALL) -c -m 644
-else
-INSTALL:=$(COPY)
-endif
-endif
-ifndef INSTALLEXE
-ifdef inUnix
-INSTALLEXE:=$(GINSTALL) -c -m 755
-else
-INSTALLEXE:=$(COPY)
-endif
-endif
-ifndef MKDIR
-MKDIR:=$(GINSTALL) -m 755 -d
-endif
-export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
-ifndef PPUMOVE
-PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(PPUMOVE),)
-PPUMOVE= __missing_command_PPUMOVE
-else
-PPUMOVE:=$(firstword $(PPUMOVE))
-endif
-endif
-export PPUMOVE
-ifndef FPCMAKE
-FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(FPCMAKE),)
-FPCMAKE= __missing_command_FPCMAKE
-else
-FPCMAKE:=$(firstword $(FPCMAKE))
-endif
-endif
-export FPCMAKE
-ifndef ZIPPROG
-ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(ZIPPROG),)
-ZIPPROG= __missing_command_ZIPPROG
-else
-ZIPPROG:=$(firstword $(ZIPPROG))
-endif
-endif
-export ZIPPROG
-ifndef TARPROG
-TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(TARPROG),)
-TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(TARPROG),)
-TARPROG= __missing_command_TARPROG
-else
-TARPROG:=$(firstword $(TARPROG))
-endif
-else
-TARPROG:=$(firstword $(TARPROG))
-endif
-endif
-export TARPROG
-ASNAME=$(BINUTILSPREFIX)as
-LDNAME=$(BINUTILSPREFIX)ld
-ARNAME=$(BINUTILSPREFIX)ar
-RCNAME=$(BINUTILSPREFIX)rc
-ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),win32)
-ifeq ($(CROSSBINDIR),)
-ASNAME=asw
-LDNAME=ldw
-ARNAME=arw
-endif
-endif
-endif
-ifndef ASPROG
-ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
-else
-ASPROG=$(ASNAME)
-endif
-endif
-ifndef LDPROG
-ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
-else
-LDPROG=$(LDNAME)
-endif
-endif
-ifndef RCPROG
-ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
-else
-RCPROG=$(RCNAME)
-endif
-endif
-ifndef ARPROG
-ifdef CROSSBINDIR
-ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
-else
-ARPROG=$(ARNAME)
-endif
-endif
-AS=$(ASPROG)
-LD=$(LDPROG)
-RC=$(RCPROG)
-AR=$(ARPROG)
-PPAS=ppas$(SRCBATCHEXT)
-ifdef inUnix
-LDCONFIG=ldconfig
-else
-LDCONFIG=
-endif
-ifdef DATE
-DATESTR:=$(shell $(DATE) +%Y%m%d)
-else
-DATESTR=
-endif
-ifndef UPXPROG
-ifeq ($(OS_TARGET),go32v2)
-UPXPROG:=1
-endif
-ifeq ($(OS_TARGET),win32)
-UPXPROG:=1
-endif
-ifdef UPXPROG
-UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
-ifeq ($(UPXPROG),)
-UPXPROG=
-else
-UPXPROG:=$(firstword $(UPXPROG))
-endif
-else
-UPXPROG=
-endif
-endif
-export UPXPROG
-ZIPOPT=-9
-ZIPEXT=.zip
-ifeq ($(USETAR),bz2)
-TAROPT=vj
-TAREXT=.tar.bz2
-else
-TAROPT=vz
-TAREXT=.tar.gz
-endif
-override REQUIRE_PACKAGES=rtl oracle
-ifeq ($(FULL_TARGET),i386-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-go32v2)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-win32)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-os2)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-freebsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-beos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-haiku)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-netbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-solaris)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-qnx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-netware)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-openbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-wdosx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-emx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-watcom)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-netwlibc)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-freebsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-netbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-amiga)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-atari)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-openbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-palmos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-netbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-amiga)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-macos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-morphos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),sparc-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),sparc-netbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),sparc-solaris)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),x86_64-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),x86_64-freebsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-palmos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-gba)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-nds)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),avr-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_ORACLE=1
-endif
-ifdef REQUIRE_PACKAGES_RTL
-PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_RTL),)
-ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),)
-UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
-else
-UNITDIR_RTL=$(PACKAGEDIR_RTL)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_RTL)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_RTL=
-UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_RTL),)
-UNITDIR_RTL:=$(firstword $(UNITDIR_RTL))
-else
-UNITDIR_RTL=
-endif
-endif
-ifdef UNITDIR_RTL
-override COMPILER_UNITDIR+=$(UNITDIR_RTL)
-endif
-endif
-ifdef REQUIRE_PACKAGES_ORACLE
-PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_ORACLE),)
-ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),)
-UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)
-else
-UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_ORACLE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_ORACLE=
-UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_ORACLE),)
-UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE))
-else
-UNITDIR_ORACLE=
-endif
-endif
-ifdef UNITDIR_ORACLE
-override COMPILER_UNITDIR+=$(UNITDIR_ORACLE)
-endif
-endif
-ifndef NOCPUDEF
-override FPCOPTDEF=$(ARCH)
-endif
-ifneq ($(OS_TARGET),$(OS_SOURCE))
-override FPCOPT+=-T$(OS_TARGET)
-endif
-ifneq ($(CPU_TARGET),$(CPU_SOURCE))
-override FPCOPT+=-P$(ARCH)
-endif
-ifeq ($(OS_SOURCE),openbsd)
-override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
-endif
-ifndef CROSSBOOTSTRAP
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX)
-endif
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-Xr$(RLINKPATH)
-endif
-endif
-ifdef UNITDIR
-override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
-endif
-ifdef LIBDIR
-override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
-endif
-ifdef OBJDIR
-override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
-endif
-ifdef INCDIR
-override FPCOPT+=$(addprefix -Fi,$(INCDIR))
-endif
-ifdef LINKSMART
-override FPCOPT+=-XX
-endif
-ifdef CREATESMART
-override FPCOPT+=-CX
-endif
-ifdef DEBUG
-override FPCOPT+=-gl
-override FPCOPTDEF+=DEBUG
-endif
-ifdef RELEASE
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(CPU_TARGET),i386)
-FPCCPUOPT:=-OG2p3
-endif
-ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
-endif
-else
-FPCCPUOPT:=-O2
-endif
-override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
-override FPCOPTDEF+=RELEASE
-endif
-ifdef STRIP
-override FPCOPT+=-Xs
-endif
-ifdef OPTIMIZE
-override FPCOPT+=-O2
-endif
-ifdef VERBOSE
-override FPCOPT+=-vwni
-endif
-ifdef COMPILER_OPTIONS
-override FPCOPT+=$(COMPILER_OPTIONS)
-endif
-ifdef COMPILER_UNITDIR
-override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))
-endif
-ifdef COMPILER_LIBRARYDIR
-override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))
-endif
-ifdef COMPILER_OBJECTDIR
-override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))
-endif
-ifdef COMPILER_INCLUDEDIR
-override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))
-endif
-ifdef CROSSBINDIR
-override FPCOPT+=-FD$(CROSSBINDIR)
-endif
-ifdef COMPILER_TARGETDIR
-override FPCOPT+=-FE$(COMPILER_TARGETDIR)
-ifeq ($(COMPILER_TARGETDIR),.)
-override TARGETDIRPREFIX=
-else
-override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/
-endif
-endif
-ifdef COMPILER_UNITTARGETDIR
-override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)
-ifeq ($(COMPILER_UNITTARGETDIR),.)
-override UNITTARGETDIRPREFIX=
-else
-override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/
-endif
-else
-ifdef COMPILER_TARGETDIR
-override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
-override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
-endif
-endif
-ifdef CREATESHARED
-override FPCOPT+=-Cg
-ifeq ($(CPU_TARGET),i386)
-override FPCOPT+=-Aas
-endif
-endif
-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
-ifeq ($(CPU_TARGET),x86_64)
-override FPCOPT+=-Cg
-endif
-endif
-endif
-ifdef LINKSHARED
-endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
-ifdef OPT
-override FPCOPT+=$(OPT)
-endif
-ifdef FPCOPTDEF
-override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
-endif
-ifdef CFGFILE
-override FPCOPT+=@$(CFGFILE)
-endif
-ifdef USEENV
-override FPCEXTCMD:=$(FPCOPT)
-override FPCOPT:=!FPCEXTCMD
-export FPCEXTCMD
-endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
-override COMPILER:=$(FPC) $(FPCOPT)
-ifeq (,$(findstring -s ,$(COMPILER)))
-EXECPPAS=
-else
-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
-ifdef RUNBATCH
-EXECPPAS:=@$(RUNBATCH) $(PPAS)
-else
-EXECPPAS:=@$(PPAS)
-endif
-endif
-endif
-.PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
-override ALLTARGET+=fpc_units
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
-override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
-override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
-endif
-fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
-ifdef TARGET_RSTS
-override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
-override CLEANRSTFILES+=$(RSTFILES)
-endif
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
-$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
-	@$(ECHOREDIR) Compiled > $(FPCMADE)
-fpc_all: $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-fpc_release:
-	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
-$(COMPILER_UNITTARGETDIR):
-	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
-$(COMPILER_TARGETDIR):
-	$(MKDIRTREE) $(COMPILER_TARGETDIR)
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
-%.res: %.rc
-	windres -i $< -o $@
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.inc $(COMPILER_INCLUDEDIR)
-vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_shared
-override INSTALLTARGET+=fpc_shared_install
-ifndef SHARED_LIBVERSION
-SHARED_LIBVERSION=$(FPC_VERSION)
-endif
-ifndef SHARED_LIBNAME
-SHARED_LIBNAME=$(PACKAGE_NAME)
-endif
-ifndef SHARED_FULLNAME
-SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
-endif
-ifndef SHARED_LIBUNITS
-SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
-override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
-endif
-fpc_shared:
-ifdef HASSHAREDLIB
-	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
-ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
-endif
-else
-	@$(ECHO) Shared Libraries not supported
-endif
-fpc_shared_install:
-ifneq ($(SHARED_BUILD),n)
-ifneq ($(SHARED_LIBUNITS),)
-ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
-	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
-endif
-endif
-endif
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
-endif
-ifdef INSTALLPPUFILES
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
-endif
-override INSTALL_CREATEPACKAGEFPC=1
-endif
-ifdef INSTALLEXEFILES
-ifneq ($(TARGETDIRPREFIX),)
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
-endif
-endif
-fpc_install: all $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALL_CREATEPACKAGEFPC
-ifdef FPCMAKE
-ifdef PACKAGE_VERSION
-ifneq ($(wildcard Makefile.fpc),)
-	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
-endif
-endif
-endif
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
-endif
-.PHONY: fpc_clean fpc_cleanall fpc_distclean
-ifdef EXEFILES
-override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
-endif
-ifdef CLEAN_UNITS
-override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
-endif
-ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
-ifdef DEBUGSYMEXT
-override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
-endif
-override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
-override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
-endif
-fpc_clean: $(CLEANTARGET)
-ifdef CLEANEXEFILES
-	-$(DEL) $(CLEANEXEFILES)
-endif
-ifdef CLEANPPUFILES
-	-$(DEL) $(CLEANPPUFILES)
-endif
-ifneq ($(CLEANPPULINKFILES),)
-	-$(DEL) $(CLEANPPULINKFILES)
-endif
-ifdef CLEANRSTFILES
-	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
-endif
-ifdef CLEAN_FILES
-	-$(DEL) $(CLEAN_FILES)
-endif
-ifdef LIB_NAME
-	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
-endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
-fpc_cleanall: $(CLEANTARGET)
-ifdef CLEANEXEFILES
-	-$(DEL) $(CLEANEXEFILES)
-endif
-ifdef COMPILER_UNITTARGETDIR
-ifdef CLEANPPUFILES
-	-$(DEL) $(CLEANPPUFILES)
-endif
-ifneq ($(CLEANPPULINKFILES),)
-	-$(DEL) $(CLEANPPULINKFILES)
-endif
-ifdef CLEANRSTFILES
-	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
-endif
-endif
-	-$(DELTREE) units
-	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-ifneq ($(PPUEXT),.ppu)
-	-$(DEL) *.o *.ppu *.a
-endif
-	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *_ppas$(BATCHEXT)
-ifdef AOUTEXT
-	-$(DEL) *$(AOUTEXT)
-endif
-ifdef DEBUGSYMEXT
-	-$(DEL) *$(DEBUGSYMEXT)
-endif
-fpc_distclean: cleanall
-.PHONY: fpc_baseinfo
-override INFORULES+=fpc_baseinfo
-fpc_baseinfo:
-	@$(ECHO)
-	@$(ECHO)  == Package info ==
-	@$(ECHO)  Package Name..... $(PACKAGE_NAME)
-	@$(ECHO)  Package Version.. $(PACKAGE_VERSION)
-	@$(ECHO)
-	@$(ECHO)  == Configuration info ==
-	@$(ECHO)
-	@$(ECHO)  FPC.......... $(FPC)
-	@$(ECHO)  FPC Version.. $(FPC_VERSION)
-	@$(ECHO)  Source CPU... $(CPU_SOURCE)
-	@$(ECHO)  Target CPU... $(CPU_TARGET)
-	@$(ECHO)  Source OS.... $(OS_SOURCE)
-	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Source.. $(FULL_SOURCE)
-	@$(ECHO)  Full Target.. $(FULL_TARGET)
-	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
-	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
-	@$(ECHO)
-	@$(ECHO)  == Directory info ==
-	@$(ECHO)
-	@$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)
-	@$(ECHO)
-	@$(ECHO)  Basedir......... $(BASEDIR)
-	@$(ECHO)  FPCDir.......... $(FPCDIR)
-	@$(ECHO)  CrossBinDir..... $(CROSSBINDIR)
-	@$(ECHO)  UnitsDir........ $(UNITSDIR)
-	@$(ECHO)  PackagesDir..... $(PACKAGESDIR)
-	@$(ECHO)
-	@$(ECHO)  GCC library..... $(GCCLIBDIR)
-	@$(ECHO)  Other library... $(OTHERLIBDIR)
-	@$(ECHO)
-	@$(ECHO)  == Tools info ==
-	@$(ECHO)
-	@$(ECHO)  As........ $(AS)
-	@$(ECHO)  Ld........ $(LD)
-	@$(ECHO)  Ar........ $(AR)
-	@$(ECHO)  Rc........ $(RC)
-	@$(ECHO)
-	@$(ECHO)  Mv........ $(MVPROG)
-	@$(ECHO)  Cp........ $(CPPROG)
-	@$(ECHO)  Rm........ $(RMPROG)
-	@$(ECHO)  GInstall.. $(GINSTALL)
-	@$(ECHO)  Echo...... $(ECHO)
-	@$(ECHO)  Shell..... $(SHELL)
-	@$(ECHO)  Date...... $(DATE)
-	@$(ECHO)  FPCMake... $(FPCMAKE)
-	@$(ECHO)  PPUMove... $(PPUMOVE)
-	@$(ECHO)  Upx....... $(UPXPROG)
-	@$(ECHO)  Zip....... $(ZIPPROG)
-	@$(ECHO)
-	@$(ECHO)  == Object info ==
-	@$(ECHO)
-	@$(ECHO)  Target Loaders........ $(TARGET_LOADERS)
-	@$(ECHO)  Target Units.......... $(TARGET_UNITS)
-	@$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)
-	@$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)
-	@$(ECHO)  Target Dirs........... $(TARGET_DIRS)
-	@$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)
-	@$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)
-	@$(ECHO)
-	@$(ECHO)  Clean Units......... $(CLEAN_UNITS)
-	@$(ECHO)  Clean Files......... $(CLEAN_FILES)
-	@$(ECHO)
-	@$(ECHO)  Install Units....... $(INSTALL_UNITS)
-	@$(ECHO)  Install Files....... $(INSTALL_FILES)
-	@$(ECHO)
-	@$(ECHO)  == Install info ==
-	@$(ECHO)
-	@$(ECHO)  DateStr.............. $(DATESTR)
-	@$(ECHO)  ZipName.............. $(ZIPNAME)
-	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
-	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
-	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
-	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
-	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
-	@$(ECHO)
-	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
-	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)
-	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)
-	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)
-	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)
-	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)
-	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)
-	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)
-	@$(ECHO)
-	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
-	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
-	@$(ECHO)
-.PHONY: fpc_info
-fpc_info: $(INFORULES)
-.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \
-	fpc_makefile_dirs
-fpc_makefile:
-	$(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc
-fpc_makefile_sub1:
-ifdef TARGET_DIRS
-	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS))
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS))
-endif
-fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))
-fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
-fpc_makefiles: fpc_makefile fpc_makefile_dirs
-all: fpc_all
-debug: fpc_debug
-smart: fpc_smart
-release: fpc_release
-units: fpc_units
-examples:
-shared: fpc_shared
-install: fpc_install
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
-distinstall:
-zipinstall:
-zipsourceinstall:
-zipexampleinstall:
-zipdistinstall:
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
-info: fpc_info
-makefiles: fpc_makefiles
-.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
-ifneq ($(wildcard fpcmake.loc),)
-include fpcmake.loc
-endif
-.NOTPARALLEL:
+#

+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]

+#

+default: all

+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded

+BSDs = freebsd netbsd openbsd darwin

+UNIXs = linux $(BSDs) solaris qnx

+LIMIT83fs = go32v2 os2 emx watcom

+OSNeedsComspecToRunBatch = go32v2 watcom

+FORCE:

+.PHONY: FORCE

+override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))

+ifneq ($(findstring darwin,$(OSTYPE)),)

+inUnix=1 #darwin

+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))

+else

+ifeq ($(findstring ;,$(PATH)),)

+inUnix=1

+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))

+else

+SEARCHPATH:=$(subst ;, ,$(PATH))

+endif

+endif

+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))

+PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))

+ifeq ($(PWD),)

+PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))

+ifeq ($(PWD),)

+$(error You need the GNU utils package to use this Makefile)

+else

+PWD:=$(firstword $(PWD))

+SRCEXEEXT=

+endif

+else

+PWD:=$(firstword $(PWD))

+SRCEXEEXT=.exe

+endif

+ifndef inUnix

+ifeq ($(OS),Windows_NT)

+inWinNT=1

+else

+ifdef OS2_SHELL

+inOS2=1

+endif

+endif

+else

+ifneq ($(findstring cygdrive,$(PATH)),)

+inCygWin=1

+endif

+endif

+ifdef inUnix

+SRCBATCHEXT=.sh

+else

+ifdef inOS2

+SRCBATCHEXT=.cmd

+else

+SRCBATCHEXT=.bat

+endif

+endif

+ifdef COMSPEC

+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)

+RUNBATCH=$(COMSPEC) /C

+endif

+endif

+ifdef inUnix

+PATHSEP=/

+else

+PATHSEP:=$(subst /,\,/)

+ifdef inCygWin

+PATHSEP=/

+endif

+endif

+ifdef PWD

+BASEDIR:=$(subst \,/,$(shell $(PWD)))

+ifdef inCygWin

+ifneq ($(findstring /cygdrive/,$(BASEDIR)),)

+BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))

+BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))

+BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))

+endif

+endif

+else

+BASEDIR=.

+endif

+ifdef inOS2

+ifndef ECHO

+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(ECHO),)

+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(ECHO),)

+ECHO=echo

+else

+ECHO:=$(firstword $(ECHO))

+endif

+else

+ECHO:=$(firstword $(ECHO))

+endif

+endif

+export ECHO

+endif

+override DEFAULT_FPCDIR=../../../../..

+ifndef FPC

+ifdef PP

+FPC=$(PP)

+endif

+endif

+ifndef FPC

+FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))

+ifneq ($(FPCPROG),)

+FPCPROG:=$(firstword $(FPCPROG))

+ifneq ($(CPU_TARGET),)

+FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)

+else

+FPC:=$(shell $(FPCPROG) -PB)

+endif

+ifneq ($(findstring Error,$(FPC)),)

+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))

+endif

+else

+override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))

+endif

+endif

+override FPC:=$(subst $(SRCEXEEXT),,$(FPC))

+override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)

+FOUNDFPC:=$(strip $(wildcard $(FPC)))

+ifeq ($(FOUNDFPC),)

+FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))

+ifeq ($(FOUNDFPC),)

+$(error Compiler $(FPC) not found)

+endif

+endif

+ifndef FPC_COMPILERINFO

+FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)

+endif

+ifndef FPC_VERSION

+FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))

+endif

+export FPC FPC_VERSION FPC_COMPILERINFO

+unexport CHECKDEPEND ALLDEPENDENCIES

+ifndef CPU_TARGET

+ifdef CPU_TARGET_DEFAULT

+CPU_TARGET=$(CPU_TARGET_DEFAULT)

+endif

+endif

+ifndef OS_TARGET

+ifdef OS_TARGET_DEFAULT

+OS_TARGET=$(OS_TARGET_DEFAULT)

+endif

+endif

+ifneq ($(words $(FPC_COMPILERINFO)),5)

+FPC_COMPILERINFO+=$(shell $(FPC) -iSP)

+FPC_COMPILERINFO+=$(shell $(FPC) -iTP)

+FPC_COMPILERINFO+=$(shell $(FPC) -iSO)

+FPC_COMPILERINFO+=$(shell $(FPC) -iTO)

+endif

+ifndef CPU_SOURCE

+CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))

+endif

+ifndef CPU_TARGET

+CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))

+endif

+ifndef OS_SOURCE

+OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))

+endif

+ifndef OS_TARGET

+OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))

+endif

+FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)

+FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)

+ifeq ($(CPU_TARGET),armeb)

+ARCH=arm

+override FPCOPT+=-Cb

+else

+ifeq ($(CPU_TARGET),armel)

+ARCH=arm

+override FPCOPT+=-CaEABI

+else

+ARCH=$(CPU_TARGET)

+endif

+endif

+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)

+TARGETSUFFIX=$(OS_TARGET)

+SOURCESUFFIX=$(OS_SOURCE)

+else

+TARGETSUFFIX=$(FULL_TARGET)

+SOURCESUFFIX=$(FULL_SOURCE)

+endif

+ifeq  ($(OS_TARGET),darwin)

+ifneq ($(OS_SOURCE),darwin)

+CROSSCOMPILE=1

+endif

+else

+ifneq ($(FULL_TARGET),$(FULL_SOURCE))

+CROSSCOMPILE=1

+endif

+endif

+ifeq ($(findstring makefile,$(MAKECMDGOALS)),)

+ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)

+$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)

+endif

+endif

+ifneq ($(findstring $(OS_TARGET),$(BSDs)),)

+BSDhier=1

+endif

+ifeq ($(OS_TARGET),linux)

+linuxHier=1

+endif

+export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE

+ifdef FPCDIR

+override FPCDIR:=$(subst \,/,$(FPCDIR))

+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)

+override FPCDIR=wrong

+endif

+else

+override FPCDIR=wrong

+endif

+ifdef DEFAULT_FPCDIR

+ifeq ($(FPCDIR),wrong)

+override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))

+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)

+override FPCDIR=wrong

+endif

+endif

+endif

+ifeq ($(FPCDIR),wrong)

+ifdef inUnix

+override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)

+ifeq ($(wildcard $(FPCDIR)/units),)

+override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)

+endif

+else

+override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))

+override FPCDIR:=$(FPCDIR)/..

+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)

+override FPCDIR:=$(FPCDIR)/..

+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)

+override FPCDIR:=$(BASEDIR)

+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)

+override FPCDIR=c:/pp

+endif

+endif

+endif

+endif

+endif

+ifndef CROSSBINDIR

+CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))

+endif

+ifndef BINUTILSPREFIX

+ifndef CROSSBINDIR

+ifdef CROSSCOMPILE

+BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-

+endif

+endif

+endif

+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))

+ifeq ($(UNITSDIR),)

+UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))

+endif

+PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)

+override PACKAGE_NAME=fcl-db

+PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-db/Makefile.fpc,$(PACKAGESDIR))))))

+ifeq ($(FULL_TARGET),i386-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-go32v2)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-win32)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-os2)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-freebsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-beos)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-haiku)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-netbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-solaris)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-qnx)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-netware)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-openbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-wdosx)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-darwin)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-emx)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-watcom)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-netwlibc)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-wince)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),i386-symbian)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-freebsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-netbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-amiga)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-atari)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-openbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-palmos)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),m68k-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-netbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-amiga)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-macos)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-darwin)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-morphos)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),sparc-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),sparc-netbsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),sparc-solaris)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),sparc-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),x86_64-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),x86_64-freebsd)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),x86_64-darwin)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),x86_64-win64)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),x86_64-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-palmos)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-darwin)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-wince)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-gba)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-nds)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),arm-symbian)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc64-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc64-darwin)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),powerpc64-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),avr-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),armeb-linux)

+override TARGET_UNITS+=oracleconnection

+endif

+ifeq ($(FULL_TARGET),armeb-embedded)

+override TARGET_UNITS+=oracleconnection

+endif

+override INSTALL_FPCPACKAGE=y

+ifeq ($(FULL_TARGET),i386-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-go32v2)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-win32)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-os2)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-freebsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-beos)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-haiku)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-netbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-solaris)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-qnx)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-netware)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-openbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-wdosx)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-darwin)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-emx)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-watcom)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-netwlibc)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-wince)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),i386-symbian)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-freebsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-netbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-amiga)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-atari)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-openbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-palmos)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),m68k-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-netbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-amiga)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-macos)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-darwin)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-morphos)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),sparc-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),sparc-netbsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),sparc-solaris)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),sparc-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),x86_64-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),x86_64-freebsd)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),x86_64-darwin)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),x86_64-win64)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),x86_64-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-palmos)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-darwin)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-wince)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-gba)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-nds)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),arm-symbian)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc64-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc64-darwin)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),powerpc64-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),avr-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),armeb-linux)

+override COMPILER_OPTIONS+=-S2

+endif

+ifeq ($(FULL_TARGET),armeb-embedded)

+override COMPILER_OPTIONS+=-S2

+endif

+ifdef REQUIRE_UNITSDIR

+override UNITSDIR+=$(REQUIRE_UNITSDIR)

+endif

+ifdef REQUIRE_PACKAGESDIR

+override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)

+endif

+ifdef ZIPINSTALL

+ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)

+UNIXHier=1

+endif

+else

+ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)

+UNIXHier=1

+endif

+endif

+ifndef INSTALL_PREFIX

+ifdef PREFIX

+INSTALL_PREFIX=$(PREFIX)

+endif

+endif

+ifndef INSTALL_PREFIX

+ifdef UNIXHier

+INSTALL_PREFIX=/usr/local

+else

+ifdef INSTALL_FPCPACKAGE

+INSTALL_BASEDIR:=/pp

+else

+INSTALL_BASEDIR:=/$(PACKAGE_NAME)

+endif

+endif

+endif

+export INSTALL_PREFIX

+ifdef INSTALL_FPCSUBDIR

+export INSTALL_FPCSUBDIR

+endif

+ifndef DIST_DESTDIR

+DIST_DESTDIR:=$(BASEDIR)

+endif

+export DIST_DESTDIR

+ifndef COMPILER_UNITTARGETDIR

+ifdef PACKAGEDIR_MAIN

+COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)

+else

+COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)

+endif

+endif

+ifndef COMPILER_TARGETDIR

+COMPILER_TARGETDIR=.

+endif

+ifndef INSTALL_BASEDIR

+ifdef UNIXHier

+ifdef INSTALL_FPCPACKAGE

+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)

+else

+INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)

+endif

+else

+INSTALL_BASEDIR:=$(INSTALL_PREFIX)

+endif

+endif

+ifndef INSTALL_BINDIR

+ifdef UNIXHier

+INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin

+else

+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin

+ifdef INSTALL_FPCPACKAGE

+ifdef CROSSCOMPILE

+ifdef CROSSINSTALL

+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)

+else

+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)

+endif

+else

+INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)

+endif

+endif

+endif

+endif

+ifndef INSTALL_UNITDIR

+INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)

+ifdef INSTALL_FPCPACKAGE

+ifdef PACKAGE_NAME

+INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)

+endif

+endif

+endif

+ifndef INSTALL_LIBDIR

+ifdef UNIXHier

+INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib

+else

+INSTALL_LIBDIR:=$(INSTALL_UNITDIR)

+endif

+endif

+ifndef INSTALL_SOURCEDIR

+ifdef UNIXHier

+ifdef BSDhier

+SRCPREFIXDIR=share/src

+else

+ifdef linuxHier

+SRCPREFIXDIR=share/src

+else

+SRCPREFIXDIR=src

+endif

+endif

+ifdef INSTALL_FPCPACKAGE

+ifdef INSTALL_FPCSUBDIR

+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)

+else

+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)

+endif

+else

+INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)

+endif

+else

+ifdef INSTALL_FPCPACKAGE

+ifdef INSTALL_FPCSUBDIR

+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)

+else

+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)

+endif

+else

+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source

+endif

+endif

+endif

+ifndef INSTALL_DOCDIR

+ifdef UNIXHier

+ifdef BSDhier

+DOCPREFIXDIR=share/doc

+else

+ifdef linuxHier

+DOCPREFIXDIR=share/doc

+else

+DOCPREFIXDIR=doc

+endif

+endif

+ifdef INSTALL_FPCPACKAGE

+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)

+else

+INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)

+endif

+else

+ifdef INSTALL_FPCPACKAGE

+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)

+else

+INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc

+endif

+endif

+endif

+ifndef INSTALL_EXAMPLEDIR

+ifdef UNIXHier

+ifdef INSTALL_FPCPACKAGE

+ifdef BSDhier

+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)

+else

+ifdef linuxHier

+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples

+else

+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)

+endif

+endif

+else

+ifdef BSDhier

+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)

+else

+ifdef linuxHier

+INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)

+else

+INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)

+endif

+endif

+endif

+else

+ifdef INSTALL_FPCPACKAGE

+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)

+else

+INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples

+endif

+endif

+endif

+ifndef INSTALL_DATADIR

+INSTALL_DATADIR=$(INSTALL_BASEDIR)

+endif

+ifndef INSTALL_SHAREDDIR

+INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib

+endif

+ifdef CROSSCOMPILE

+ifndef CROSSBINDIR

+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))

+ifeq ($(CROSSBINDIR),)

+CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$(FULL_SOURCE))

+endif

+endif

+else

+CROSSBINDIR=

+endif

+ifeq ($(OS_SOURCE),linux)

+ifndef GCCLIBDIR

+ifeq ($(CPU_TARGET),i386)

+ifneq ($(findstring x86_64,$(shell uname -a)),)

+ifeq ($(BINUTILSPREFIX),)

+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)

+endif

+endif

+endif

+ifeq ($(CPU_TARGET),powerpc64)

+ifeq ($(BINUTILSPREFIX),)

+GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)

+endif

+endif

+endif

+ifndef GCCLIBDIR

+CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))

+ifneq ($(CROSSGCC),)

+GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)

+endif

+endif

+ifndef OTHERLIBDIR

+OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')

+endif

+endif

+ifdef inUnix

+ifeq ($(OS_SOURCE),netbsd)

+OTHERLIBDIR+=/usr/pkg/lib

+endif

+export GCCLIBDIR OTHERLIB

+endif

+BATCHEXT=.bat

+LOADEREXT=.as

+EXEEXT=.exe

+PPLEXT=.ppl

+PPUEXT=.ppu

+OEXT=.o

+ASMEXT=.s

+SMARTEXT=.sl

+STATICLIBEXT=.a

+SHAREDLIBEXT=.so

+SHAREDLIBPREFIX=libfp

+STATICLIBPREFIX=libp

+IMPORTLIBPREFIX=libimp

+RSTEXT=.rst

+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)

+ifeq ($(OS_TARGET),go32v1)

+STATICLIBPREFIX=

+SHORTSUFFIX=v1

+endif

+ifeq ($(OS_TARGET),go32v2)

+STATICLIBPREFIX=

+SHORTSUFFIX=dos

+endif

+ifeq ($(OS_TARGET),watcom)

+STATICLIBPREFIX=

+OEXT=.obj

+ASMEXT=.asm

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=wat

+endif

+ifeq ($(OS_TARGET),linux)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=lnx

+endif

+ifeq ($(OS_TARGET),freebsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=fbs

+endif

+ifeq ($(OS_TARGET),netbsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=nbs

+endif

+ifeq ($(OS_TARGET),openbsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=obs

+endif

+ifeq ($(OS_TARGET),win32)

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=w32

+endif

+ifeq ($(OS_TARGET),os2)

+BATCHEXT=.cmd

+AOUTEXT=.out

+STATICLIBPREFIX=

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=os2

+ECHO=echo

+endif

+ifeq ($(OS_TARGET),emx)

+BATCHEXT=.cmd

+AOUTEXT=.out

+STATICLIBPREFIX=

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=emx

+ECHO=echo

+endif

+ifeq ($(OS_TARGET),amiga)

+EXEEXT=

+SHAREDLIBEXT=.library

+SHORTSUFFIX=amg

+endif

+ifeq ($(OS_TARGET),morphos)

+EXEEXT=

+SHAREDLIBEXT=.library

+SHORTSUFFIX=mos

+endif

+ifeq ($(OS_TARGET),atari)

+EXEEXT=.ttp

+SHORTSUFFIX=ata

+endif

+ifeq ($(OS_TARGET),beos)

+BATCHEXT=.sh

+EXEEXT=

+SHORTSUFFIX=be

+endif

+ifeq ($(OS_TARGET),haiku)

+BATCHEXT=.sh

+EXEEXT=

+SHORTSUFFIX=hai

+endif

+ifeq ($(OS_TARGET),solaris)

+BATCHEXT=.sh

+EXEEXT=

+SHORTSUFFIX=sun

+endif

+ifeq ($(OS_TARGET),qnx)

+BATCHEXT=.sh

+EXEEXT=

+SHORTSUFFIX=qnx

+endif

+ifeq ($(OS_TARGET),netware)

+EXEEXT=.nlm

+STATICLIBPREFIX=

+SHORTSUFFIX=nw

+endif

+ifeq ($(OS_TARGET),netwlibc)

+EXEEXT=.nlm

+STATICLIBPREFIX=

+SHORTSUFFIX=nwl

+endif

+ifeq ($(OS_TARGET),macos)

+BATCHEXT=

+EXEEXT=

+DEBUGSYMEXT=.xcoff

+SHORTSUFFIX=mac

+endif

+ifeq ($(OS_TARGET),darwin)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=dwn

+endif

+ifeq ($(OS_TARGET),gba)

+EXEEXT=.gba

+SHAREDLIBEXT=.so

+SHORTSUFFIX=gba

+endif

+ifeq ($(OS_TARGET),symbian)

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=symbian

+endif

+else

+ifeq ($(OS_TARGET),go32v1)

+PPUEXT=.pp1

+OEXT=.o1

+ASMEXT=.s1

+SMARTEXT=.sl1

+STATICLIBEXT=.a1

+SHAREDLIBEXT=.so1

+STATICLIBPREFIX=

+SHORTSUFFIX=v1

+endif

+ifeq ($(OS_TARGET),go32v2)

+STATICLIBPREFIX=

+SHORTSUFFIX=dos

+endif

+ifeq ($(OS_TARGET),watcom)

+STATICLIBPREFIX=

+SHORTSUFFIX=wat

+endif

+ifeq ($(OS_TARGET),linux)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=lnx

+endif

+ifeq ($(OS_TARGET),freebsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=fbs

+endif

+ifeq ($(OS_TARGET),netbsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=nbs

+endif

+ifeq ($(OS_TARGET),openbsd)

+BATCHEXT=.sh

+EXEEXT=

+HASSHAREDLIB=1

+SHORTSUFFIX=obs

+endif

+ifeq ($(OS_TARGET),win32)

+PPUEXT=.ppw

+OEXT=.ow

+ASMEXT=.sw

+SMARTEXT=.slw

+STATICLIBEXT=.aw

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=w32

+endif

+ifeq ($(OS_TARGET),os2)

+BATCHEXT=.cmd

+PPUEXT=.ppo

+ASMEXT=.so2

+OEXT=.oo2

+AOUTEXT=.out

+SMARTEXT=.sl2

+STATICLIBPREFIX=

+STATICLIBEXT=.ao2

+SHAREDLIBEXT=.dll

+SHORTSUFFIX=os2

+ECHO=echo

+endif

+ifeq ($(OS_TARGET),amiga)

+EXEEXT=

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+SHAREDLIBEXT=.library

+SHORTSUFFIX=amg

+endif

+ifeq ($(OS_TARGET),atari)

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+EXEEXT=.ttp

+SHORTSUFFIX=ata

+endif

+ifeq ($(OS_TARGET),beos)

+BATCHEXT=.sh

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+EXEEXT=

+SHORTSUFFIX=be

+endif

+ifeq ($(OS_TARGET),solaris)

+BATCHEXT=.sh

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+EXEEXT=

+SHORTSUFFIX=sun

+endif

+ifeq ($(OS_TARGET),qnx)

+BATCHEXT=.sh

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+EXEEXT=

+SHORTSUFFIX=qnx

+endif

+ifeq ($(OS_TARGET),netware)

+STATICLIBPREFIX=

+PPUEXT=.ppu

+OEXT=.o

+ASMEXT=.s

+SMARTEXT=.sl

+STATICLIBEXT=.a

+SHAREDLIBEXT=.nlm

+EXEEXT=.nlm

+SHORTSUFFIX=nw

+endif

+ifeq ($(OS_TARGET),netwlibc)

+STATICLIBPREFIX=

+PPUEXT=.ppu

+OEXT=.o

+ASMEXT=.s

+SMARTEXT=.sl

+STATICLIBEXT=.a

+SHAREDLIBEXT=.nlm

+EXEEXT=.nlm

+SHORTSUFFIX=nwl

+endif

+ifeq ($(OS_TARGET),macos)

+BATCHEXT=

+PPUEXT=.ppu

+ASMEXT=.s

+OEXT=.o

+SMARTEXT=.sl

+STATICLIBEXT=.a

+EXEEXT=

+DEBUGSYMEXT=.xcoff

+SHORTSUFFIX=mac

+endif

+endif

+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)

+FPCMADE=fpcmade.$(SHORTSUFFIX)

+ZIPSUFFIX=$(SHORTSUFFIX)

+ZIPCROSSPREFIX=

+ZIPSOURCESUFFIX=src

+ZIPEXAMPLESUFFIX=exm

+else

+FPCMADE=fpcmade.$(TARGETSUFFIX)

+ZIPSOURCESUFFIX=.source

+ZIPEXAMPLESUFFIX=.examples

+ifdef CROSSCOMPILE

+ZIPSUFFIX=.$(SOURCESUFFIX)

+ZIPCROSSPREFIX=$(TARGETSUFFIX)-

+else

+ZIPSUFFIX=.$(TARGETSUFFIX)

+ZIPCROSSPREFIX=

+endif

+endif

+ifndef ECHO

+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(ECHO),)

+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(ECHO),)

+ECHO= __missing_command_ECHO

+else

+ECHO:=$(firstword $(ECHO))

+endif

+else

+ECHO:=$(firstword $(ECHO))

+endif

+endif

+export ECHO

+ifndef DATE

+DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(DATE),)

+DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(DATE),)

+DATE= __missing_command_DATE

+else

+DATE:=$(firstword $(DATE))

+endif

+else

+DATE:=$(firstword $(DATE))

+endif

+endif

+export DATE

+ifndef GINSTALL

+GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(GINSTALL),)

+GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(GINSTALL),)

+GINSTALL= __missing_command_GINSTALL

+else

+GINSTALL:=$(firstword $(GINSTALL))

+endif

+else

+GINSTALL:=$(firstword $(GINSTALL))

+endif

+endif

+export GINSTALL

+ifndef CPPROG

+CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(CPPROG),)

+CPPROG= __missing_command_CPPROG

+else

+CPPROG:=$(firstword $(CPPROG))

+endif

+endif

+export CPPROG

+ifndef RMPROG

+RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(RMPROG),)

+RMPROG= __missing_command_RMPROG

+else

+RMPROG:=$(firstword $(RMPROG))

+endif

+endif

+export RMPROG

+ifndef MVPROG

+MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(MVPROG),)

+MVPROG= __missing_command_MVPROG

+else

+MVPROG:=$(firstword $(MVPROG))

+endif

+endif

+export MVPROG

+ifndef MKDIRPROG

+MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(MKDIRPROG),)

+MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(MKDIRPROG),)

+MKDIRPROG= __missing_command_MKDIRPROG

+else

+MKDIRPROG:=$(firstword $(MKDIRPROG))

+endif

+else

+MKDIRPROG:=$(firstword $(MKDIRPROG))

+endif

+endif

+export MKDIRPROG

+ifndef ECHOREDIR

+ifndef inUnix

+ECHOREDIR=echo

+else

+ECHOREDIR=$(ECHO)

+endif

+endif

+ifndef COPY

+COPY:=$(CPPROG) -fp

+endif

+ifndef COPYTREE

+COPYTREE:=$(CPPROG) -Rfp

+endif

+ifndef MKDIRTREE

+MKDIRTREE:=$(MKDIRPROG) -p

+endif

+ifndef MOVE

+MOVE:=$(MVPROG) -f

+endif

+ifndef DEL

+DEL:=$(RMPROG) -f

+endif

+ifndef DELTREE

+DELTREE:=$(RMPROG) -rf

+endif

+ifndef INSTALL

+ifdef inUnix

+INSTALL:=$(GINSTALL) -c -m 644

+else

+INSTALL:=$(COPY)

+endif

+endif

+ifndef INSTALLEXE

+ifdef inUnix

+INSTALLEXE:=$(GINSTALL) -c -m 755

+else

+INSTALLEXE:=$(COPY)

+endif

+endif

+ifndef MKDIR

+MKDIR:=$(GINSTALL) -m 755 -d

+endif

+export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR

+ifndef PPUMOVE

+PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(PPUMOVE),)

+PPUMOVE= __missing_command_PPUMOVE

+else

+PPUMOVE:=$(firstword $(PPUMOVE))

+endif

+endif

+export PPUMOVE

+ifndef FPCMAKE

+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(FPCMAKE),)

+FPCMAKE= __missing_command_FPCMAKE

+else

+FPCMAKE:=$(firstword $(FPCMAKE))

+endif

+endif

+export FPCMAKE

+ifndef ZIPPROG

+ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(ZIPPROG),)

+ZIPPROG= __missing_command_ZIPPROG

+else

+ZIPPROG:=$(firstword $(ZIPPROG))

+endif

+endif

+export ZIPPROG

+ifndef TARPROG

+TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(TARPROG),)

+TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(TARPROG),)

+TARPROG= __missing_command_TARPROG

+else

+TARPROG:=$(firstword $(TARPROG))

+endif

+else

+TARPROG:=$(firstword $(TARPROG))

+endif

+endif

+export TARPROG

+ASNAME=$(BINUTILSPREFIX)as

+LDNAME=$(BINUTILSPREFIX)ld

+ARNAME=$(BINUTILSPREFIX)ar

+RCNAME=$(BINUTILSPREFIX)rc

+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)

+ifeq ($(OS_TARGET),win32)

+ifeq ($(CROSSBINDIR),)

+ASNAME=asw

+LDNAME=ldw

+ARNAME=arw

+endif

+endif

+endif

+ifndef ASPROG

+ifdef CROSSBINDIR

+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)

+else

+ASPROG=$(ASNAME)

+endif

+endif

+ifndef LDPROG

+ifdef CROSSBINDIR

+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)

+else

+LDPROG=$(LDNAME)

+endif

+endif

+ifndef RCPROG

+ifdef CROSSBINDIR

+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)

+else

+RCPROG=$(RCNAME)

+endif

+endif

+ifndef ARPROG

+ifdef CROSSBINDIR

+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)

+else

+ARPROG=$(ARNAME)

+endif

+endif

+AS=$(ASPROG)

+LD=$(LDPROG)

+RC=$(RCPROG)

+AR=$(ARPROG)

+PPAS=ppas$(SRCBATCHEXT)

+ifdef inUnix

+LDCONFIG=ldconfig

+else

+LDCONFIG=

+endif

+ifdef DATE

+DATESTR:=$(shell $(DATE) +%Y%m%d)

+else

+DATESTR=

+endif

+ifndef UPXPROG

+ifeq ($(OS_TARGET),go32v2)

+UPXPROG:=1

+endif

+ifeq ($(OS_TARGET),win32)

+UPXPROG:=1

+endif

+ifdef UPXPROG

+UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))

+ifeq ($(UPXPROG),)

+UPXPROG=

+else

+UPXPROG:=$(firstword $(UPXPROG))

+endif

+else

+UPXPROG=

+endif

+endif

+export UPXPROG

+ZIPOPT=-9

+ZIPEXT=.zip

+ifeq ($(USETAR),bz2)

+TAROPT=vj

+TAREXT=.tar.bz2

+else

+TAROPT=vz

+TAREXT=.tar.gz

+endif

+override REQUIRE_PACKAGES=rtl oracle

+ifeq ($(FULL_TARGET),i386-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-go32v2)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-win32)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-os2)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-freebsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-beos)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-haiku)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-netbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-solaris)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-qnx)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-netware)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-openbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-wdosx)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-darwin)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-emx)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-watcom)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-netwlibc)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-wince)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),i386-symbian)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-freebsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-netbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-amiga)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-atari)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-openbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-palmos)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),m68k-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-netbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-amiga)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-macos)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-darwin)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-morphos)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),sparc-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),sparc-netbsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),sparc-solaris)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),sparc-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),x86_64-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),x86_64-freebsd)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),x86_64-darwin)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),x86_64-win64)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),x86_64-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-palmos)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-darwin)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-wince)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-gba)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-nds)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),arm-symbian)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc64-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc64-darwin)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),powerpc64-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),avr-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),armeb-linux)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifeq ($(FULL_TARGET),armeb-embedded)

+REQUIRE_PACKAGES_RTL=1

+REQUIRE_PACKAGES_ORACLE=1

+endif

+ifdef REQUIRE_PACKAGES_RTL

+PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))

+ifneq ($(PACKAGEDIR_RTL),)

+ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),)

+UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)

+else

+UNITDIR_RTL=$(PACKAGEDIR_RTL)

+endif

+ifdef CHECKDEPEND

+$(PACKAGEDIR_RTL)/$(FPCMADE):

+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)

+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)

+endif

+else

+PACKAGEDIR_RTL=

+UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))

+ifneq ($(UNITDIR_RTL),)

+UNITDIR_RTL:=$(firstword $(UNITDIR_RTL))

+else

+UNITDIR_RTL=

+endif

+endif

+ifdef UNITDIR_RTL

+override COMPILER_UNITDIR+=$(UNITDIR_RTL)

+endif

+endif

+ifdef REQUIRE_PACKAGES_ORACLE

+PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR))))))

+ifneq ($(PACKAGEDIR_ORACLE),)

+ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),)

+UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)

+else

+UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)

+endif

+ifdef CHECKDEPEND

+$(PACKAGEDIR_ORACLE)/$(FPCMADE):

+	$(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE)

+override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)

+endif

+else

+PACKAGEDIR_ORACLE=

+UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR)))))

+ifneq ($(UNITDIR_ORACLE),)

+UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE))

+else

+UNITDIR_ORACLE=

+endif

+endif

+ifdef UNITDIR_ORACLE

+override COMPILER_UNITDIR+=$(UNITDIR_ORACLE)

+endif

+endif

+ifndef NOCPUDEF

+override FPCOPTDEF=$(ARCH)

+endif

+ifneq ($(OS_TARGET),$(OS_SOURCE))

+override FPCOPT+=-T$(OS_TARGET)

+endif

+ifneq ($(CPU_TARGET),$(CPU_SOURCE))

+override FPCOPT+=-P$(ARCH)

+endif

+ifeq ($(OS_SOURCE),openbsd)

+override FPCOPT+=-FD$(NEW_BINUTILS_PATH)

+endif

+ifndef CROSSBOOTSTRAP

+ifneq ($(BINUTILSPREFIX),)

+override FPCOPT+=-XP$(BINUTILSPREFIX)

+endif

+ifneq ($(BINUTILSPREFIX),)

+override FPCOPT+=-Xr$(RLINKPATH)

+endif

+endif

+ifdef UNITDIR

+override FPCOPT+=$(addprefix -Fu,$(UNITDIR))

+endif

+ifdef LIBDIR

+override FPCOPT+=$(addprefix -Fl,$(LIBDIR))

+endif

+ifdef OBJDIR

+override FPCOPT+=$(addprefix -Fo,$(OBJDIR))

+endif

+ifdef INCDIR

+override FPCOPT+=$(addprefix -Fi,$(INCDIR))

+endif

+ifdef LINKSMART

+override FPCOPT+=-XX

+endif

+ifdef CREATESMART

+override FPCOPT+=-CX

+endif

+ifdef DEBUG

+override FPCOPT+=-gl

+override FPCOPTDEF+=DEBUG

+endif

+ifdef RELEASE

+ifneq ($(findstring 2.0.,$(FPC_VERSION)),)

+ifeq ($(CPU_TARGET),i386)

+FPCCPUOPT:=-OG2p3

+endif

+ifeq ($(CPU_TARGET),powerpc)

+FPCCPUOPT:=-O1r

+endif

+else

+FPCCPUOPT:=-O2

+endif

+override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n

+override FPCOPTDEF+=RELEASE

+endif

+ifdef STRIP

+override FPCOPT+=-Xs

+endif

+ifdef OPTIMIZE

+override FPCOPT+=-O2

+endif

+ifdef VERBOSE

+override FPCOPT+=-vwni

+endif

+ifdef COMPILER_OPTIONS

+override FPCOPT+=$(COMPILER_OPTIONS)

+endif

+ifdef COMPILER_UNITDIR

+override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))

+endif

+ifdef COMPILER_LIBRARYDIR

+override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))

+endif

+ifdef COMPILER_OBJECTDIR

+override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))

+endif

+ifdef COMPILER_INCLUDEDIR

+override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))

+endif

+ifdef CROSSBINDIR

+override FPCOPT+=-FD$(CROSSBINDIR)

+endif

+ifdef COMPILER_TARGETDIR

+override FPCOPT+=-FE$(COMPILER_TARGETDIR)

+ifeq ($(COMPILER_TARGETDIR),.)

+override TARGETDIRPREFIX=

+else

+override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/

+endif

+endif

+ifdef COMPILER_UNITTARGETDIR

+override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)

+ifeq ($(COMPILER_UNITTARGETDIR),.)

+override UNITTARGETDIRPREFIX=

+else

+override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/

+endif

+else

+ifdef COMPILER_TARGETDIR

+override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)

+override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)

+endif

+endif

+ifdef CREATESHARED

+override FPCOPT+=-Cg

+ifeq ($(CPU_TARGET),i386)

+override FPCOPT+=-Aas

+endif

+endif

+ifeq ($(findstring 2.0.,$(FPC_VERSION)),)

+ifeq ($(OS_TARGET),linux)

+ifeq ($(CPU_TARGET),x86_64)

+override FPCOPT+=-Cg

+endif

+endif

+endif

+ifdef LINKSHARED

+endif

+ifdef GCCLIBDIR

+override FPCOPT+=-Fl$(GCCLIBDIR)

+endif

+ifdef OTHERLIBDIR

+override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))

+endif

+ifdef OPT

+override FPCOPT+=$(OPT)

+endif

+ifdef FPCOPTDEF

+override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))

+endif

+ifdef CFGFILE

+override FPCOPT+=@$(CFGFILE)

+endif

+ifdef USEENV

+override FPCEXTCMD:=$(FPCOPT)

+override FPCOPT:=!FPCEXTCMD

+export FPCEXTCMD

+endif

+override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)

+override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)

+ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))

+override ACROSSCOMPILE=1

+endif

+ifdef ACROSSCOMPILE

+override FPCOPT+=$(CROSSOPT)

+endif

+override COMPILER:=$(FPC) $(FPCOPT)

+ifeq (,$(findstring -s ,$(COMPILER)))

+EXECPPAS=

+else

+ifeq ($(FULL_SOURCE),$(FULL_TARGET))

+ifdef RUNBATCH

+EXECPPAS:=@$(RUNBATCH) $(PPAS)

+else

+EXECPPAS:=@$(PPAS)

+endif

+endif

+endif

+.PHONY: fpc_units

+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)

+override ALLTARGET+=fpc_units

+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))

+override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))

+override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)

+override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)

+endif

+fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)

+ifdef TARGET_RSTS

+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))

+override CLEANRSTFILES+=$(RSTFILES)

+endif

+.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared

+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)

+	@$(ECHOREDIR) Compiled > $(FPCMADE)

+fpc_all: $(FPCMADE)

+fpc_smart:

+	$(MAKE) all LINKSMART=1 CREATESMART=1

+fpc_debug:

+	$(MAKE) all DEBUG=1

+fpc_release:

+	$(MAKE) all RELEASE=1

+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res

+$(COMPILER_UNITTARGETDIR):

+	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)

+$(COMPILER_TARGETDIR):

+	$(MKDIRTREE) $(COMPILER_TARGETDIR)

+%$(PPUEXT): %.pp

+	$(COMPILER) $<

+	$(EXECPPAS)

+%$(PPUEXT): %.pas

+	$(COMPILER) $<

+	$(EXECPPAS)

+%$(EXEEXT): %.pp

+	$(COMPILER) $<

+	$(EXECPPAS)

+%$(EXEEXT): %.pas

+	$(COMPILER) $<

+	$(EXECPPAS)

+%$(EXEEXT): %.lpr

+	$(COMPILER) $<

+	$(EXECPPAS)

+%$(EXEEXT): %.dpr

+	$(COMPILER) $<

+	$(EXECPPAS)

+%.res: %.rc

+	windres -i $< -o $@

+vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)

+vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)

+vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)

+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)

+vpath %.inc $(COMPILER_INCLUDEDIR)

+vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)

+vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)

+.PHONY: fpc_shared

+override INSTALLTARGET+=fpc_shared_install

+ifndef SHARED_LIBVERSION

+SHARED_LIBVERSION=$(FPC_VERSION)

+endif

+ifndef SHARED_LIBNAME

+SHARED_LIBNAME=$(PACKAGE_NAME)

+endif

+ifndef SHARED_FULLNAME

+SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)

+endif

+ifndef SHARED_LIBUNITS

+SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)

+override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))

+endif

+fpc_shared:

+ifdef HASSHAREDLIB

+	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1

+ifneq ($(SHARED_BUILD),n)

+	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)

+endif

+else

+	@$(ECHO) Shared Libraries not supported

+endif

+fpc_shared_install:

+ifneq ($(SHARED_BUILD),n)

+ifneq ($(SHARED_LIBUNITS),)

+ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)

+	$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)

+endif

+endif

+endif

+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall

+ifdef INSTALL_UNITS

+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))

+endif

+ifdef INSTALL_BUILDUNIT

+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))

+endif

+ifdef INSTALLPPUFILES

+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))

+ifneq ($(UNITTARGETDIRPREFIX),)

+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))

+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))

+endif

+override INSTALL_CREATEPACKAGEFPC=1

+endif

+ifdef INSTALLEXEFILES

+ifneq ($(TARGETDIRPREFIX),)

+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))

+endif

+endif

+fpc_install: all $(INSTALLTARGET)

+ifdef INSTALLEXEFILES

+	$(MKDIR) $(INSTALL_BINDIR)

+ifdef UPXPROG

+	-$(UPXPROG) $(INSTALLEXEFILES)

+endif

+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)

+endif

+ifdef INSTALL_CREATEPACKAGEFPC

+ifdef FPCMAKE

+ifdef PACKAGE_VERSION

+ifneq ($(wildcard Makefile.fpc),)

+	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc

+	$(MKDIR) $(INSTALL_UNITDIR)

+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)

+endif

+endif

+endif

+endif

+ifdef INSTALLPPUFILES

+	$(MKDIR) $(INSTALL_UNITDIR)

+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)

+ifneq ($(INSTALLPPULINKFILES),)

+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)

+endif

+ifneq ($(wildcard $(LIB_FULLNAME)),)

+	$(MKDIR) $(INSTALL_LIBDIR)

+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)

+ifdef inUnix

+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)

+endif

+endif

+endif

+ifdef INSTALL_FILES

+	$(MKDIR) $(INSTALL_DATADIR)

+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)

+endif

+fpc_sourceinstall: distclean

+	$(MKDIR) $(INSTALL_SOURCEDIR)

+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)

+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))

+ifdef HASEXAMPLES

+	$(MKDIR) $(INSTALL_EXAMPLEDIR)

+endif

+ifdef EXAMPLESOURCEFILES

+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)

+endif

+ifdef TARGET_EXAMPLEDIRS

+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)

+endif

+.PHONY: fpc_clean fpc_cleanall fpc_distclean

+ifdef EXEFILES

+override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))

+endif

+ifdef CLEAN_UNITS

+override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))

+endif

+ifdef CLEANPPUFILES

+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))

+ifdef DEBUGSYMEXT

+override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))

+endif

+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))

+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))

+endif

+fpc_clean: $(CLEANTARGET)

+ifdef CLEANEXEFILES

+	-$(DEL) $(CLEANEXEFILES)

+endif

+ifdef CLEANPPUFILES

+	-$(DEL) $(CLEANPPUFILES)

+endif

+ifneq ($(CLEANPPULINKFILES),)

+	-$(DEL) $(CLEANPPULINKFILES)

+endif

+ifdef CLEANRSTFILES

+	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))

+endif

+ifdef CLEAN_FILES

+	-$(DEL) $(CLEAN_FILES)

+endif

+ifdef LIB_NAME

+	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)

+endif

+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)

+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)

+fpc_cleanall: $(CLEANTARGET)

+ifdef CLEANEXEFILES

+	-$(DEL) $(CLEANEXEFILES)

+endif

+ifdef COMPILER_UNITTARGETDIR

+ifdef CLEANPPUFILES

+	-$(DEL) $(CLEANPPUFILES)

+endif

+ifneq ($(CLEANPPULINKFILES),)

+	-$(DEL) $(CLEANPPULINKFILES)

+endif

+ifdef CLEANRSTFILES

+	-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))

+endif

+endif

+	-$(DELTREE) units

+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)

+ifneq ($(PPUEXT),.ppu)

+	-$(DEL) *.o *.ppu *.a

+endif

+	-$(DELTREE) *$(SMARTEXT)

+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)

+	-$(DEL) *_ppas$(BATCHEXT)

+ifdef AOUTEXT

+	-$(DEL) *$(AOUTEXT)

+endif

+ifdef DEBUGSYMEXT

+	-$(DEL) *$(DEBUGSYMEXT)

+endif

+fpc_distclean: cleanall

+.PHONY: fpc_baseinfo

+override INFORULES+=fpc_baseinfo

+fpc_baseinfo:

+	@$(ECHO)

+	@$(ECHO)  == Package info ==

+	@$(ECHO)  Package Name..... $(PACKAGE_NAME)

+	@$(ECHO)  Package Version.. $(PACKAGE_VERSION)

+	@$(ECHO)

+	@$(ECHO)  == Configuration info ==

+	@$(ECHO)

+	@$(ECHO)  FPC.......... $(FPC)

+	@$(ECHO)  FPC Version.. $(FPC_VERSION)

+	@$(ECHO)  Source CPU... $(CPU_SOURCE)

+	@$(ECHO)  Target CPU... $(CPU_TARGET)

+	@$(ECHO)  Source OS.... $(OS_SOURCE)

+	@$(ECHO)  Target OS.... $(OS_TARGET)

+	@$(ECHO)  Full Source.. $(FULL_SOURCE)

+	@$(ECHO)  Full Target.. $(FULL_TARGET)

+	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)

+	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)

+	@$(ECHO)

+	@$(ECHO)  == Directory info ==

+	@$(ECHO)

+	@$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)

+	@$(ECHO)

+	@$(ECHO)  Basedir......... $(BASEDIR)

+	@$(ECHO)  FPCDir.......... $(FPCDIR)

+	@$(ECHO)  CrossBinDir..... $(CROSSBINDIR)

+	@$(ECHO)  UnitsDir........ $(UNITSDIR)

+	@$(ECHO)  PackagesDir..... $(PACKAGESDIR)

+	@$(ECHO)

+	@$(ECHO)  GCC library..... $(GCCLIBDIR)

+	@$(ECHO)  Other library... $(OTHERLIBDIR)

+	@$(ECHO)

+	@$(ECHO)  == Tools info ==

+	@$(ECHO)

+	@$(ECHO)  As........ $(AS)

+	@$(ECHO)  Ld........ $(LD)

+	@$(ECHO)  Ar........ $(AR)

+	@$(ECHO)  Rc........ $(RC)

+	@$(ECHO)

+	@$(ECHO)  Mv........ $(MVPROG)

+	@$(ECHO)  Cp........ $(CPPROG)

+	@$(ECHO)  Rm........ $(RMPROG)

+	@$(ECHO)  GInstall.. $(GINSTALL)

+	@$(ECHO)  Echo...... $(ECHO)

+	@$(ECHO)  Shell..... $(SHELL)

+	@$(ECHO)  Date...... $(DATE)

+	@$(ECHO)  FPCMake... $(FPCMAKE)

+	@$(ECHO)  PPUMove... $(PPUMOVE)

+	@$(ECHO)  Upx....... $(UPXPROG)

+	@$(ECHO)  Zip....... $(ZIPPROG)

+	@$(ECHO)

+	@$(ECHO)  == Object info ==

+	@$(ECHO)

+	@$(ECHO)  Target Loaders........ $(TARGET_LOADERS)

+	@$(ECHO)  Target Units.......... $(TARGET_UNITS)

+	@$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)

+	@$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)

+	@$(ECHO)  Target Dirs........... $(TARGET_DIRS)

+	@$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)

+	@$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)

+	@$(ECHO)

+	@$(ECHO)  Clean Units......... $(CLEAN_UNITS)

+	@$(ECHO)  Clean Files......... $(CLEAN_FILES)

+	@$(ECHO)

+	@$(ECHO)  Install Units....... $(INSTALL_UNITS)

+	@$(ECHO)  Install Files....... $(INSTALL_FILES)

+	@$(ECHO)

+	@$(ECHO)  == Install info ==

+	@$(ECHO)

+	@$(ECHO)  DateStr.............. $(DATESTR)

+	@$(ECHO)  ZipName.............. $(ZIPNAME)

+	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)

+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)

+	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)

+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)

+	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)

+	@$(ECHO)

+	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

+	@$(ECHO)  Install binary dir... $(INSTALL_BINDIR)

+	@$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)

+	@$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)

+	@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)

+	@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)

+	@$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)

+	@$(ECHO)  Install data dir..... $(INSTALL_DATADIR)

+	@$(ECHO)

+	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)

+	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)

+	@$(ECHO)

+.PHONY: fpc_info

+fpc_info: $(INFORULES)

+.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \

+	fpc_makefile_dirs

+fpc_makefile:

+	$(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc

+fpc_makefile_sub1:

+ifdef TARGET_DIRS

+	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_DIRS))

+endif

+ifdef TARGET_EXAMPLEDIRS

+	$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGET_EXAMPLEDIRS))

+endif

+fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS))

+fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2

+fpc_makefiles: fpc_makefile fpc_makefile_dirs

+all: fpc_all

+debug: fpc_debug

+smart: fpc_smart

+release: fpc_release

+units: fpc_units

+examples:

+shared: fpc_shared

+install: fpc_install

+sourceinstall: fpc_sourceinstall

+exampleinstall: fpc_exampleinstall

+distinstall:

+zipinstall:

+zipsourceinstall:

+zipexampleinstall:

+zipdistinstall:

+clean: fpc_clean

+distclean: fpc_distclean

+cleanall: fpc_cleanall

+info: fpc_info

+makefiles: fpc_makefiles

+.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles

+ifneq ($(wildcard fpcmake.loc),)

+include fpcmake.loc

+endif

+.NOTPARALLEL:

diff --git a/packages/fcl-db/src/sqldb/postgres/Makefile b/packages/fcl-db/src/sqldb/postgres/Makefile
index 224f7ca67f..0486a21739 100644
--- a/packages/fcl-db/src/sqldb/postgres/Makefile
+++ b/packages/fcl-db/src/sqldb/postgres/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqldb/sqlite/Makefile b/packages/fcl-db/src/sqldb/sqlite/Makefile
index 5a12ad2766..092e0862b4 100644
--- a/packages/fcl-db/src/sqldb/sqlite/Makefile
+++ b/packages/fcl-db/src/sqldb/sqlite/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-db/src/sqlite/Makefile b/packages/fcl-db/src/sqlite/Makefile
index 9ccabe336d..e6de7a9567 100644
--- a/packages/fcl-db/src/sqlite/Makefile
+++ b/packages/fcl-db/src/sqlite/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile
index 2c80926a89..d3d4ea35f5 100644
--- a/packages/fcl-fpcunit/Makefile
+++ b/packages/fcl-fpcunit/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2505,7 +2505,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile
index ecffdcff31..2ec6a06ec3 100644
--- a/packages/fcl-image/Makefile
+++ b/packages/fcl-image/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2871,7 +2871,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile
index 4052eb5175..7049819158 100644
--- a/packages/fcl-json/Makefile
+++ b/packages/fcl-json/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2427,7 +2427,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile
index 90a1befda3..e5081499fb 100644
--- a/packages/fcl-net/Makefile
+++ b/packages/fcl-net/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2834,7 +2834,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile
index 37b2604f7f..4a398da125 100644
--- a/packages/fcl-passrc/Makefile
+++ b/packages/fcl-passrc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2287,7 +2287,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile
index ef23ea3bfa..ea58e2af25 100644
--- a/packages/fcl-process/Makefile
+++ b/packages/fcl-process/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2383,7 +2383,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile
index a7bfe44d54..3b973e06bb 100644
--- a/packages/fcl-registry/Makefile
+++ b/packages/fcl-registry/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2337,7 +2337,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile
index 591dd3f7a0..6309de63c9 100644
--- a/packages/fcl-web/Makefile
+++ b/packages/fcl-web/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -3079,7 +3079,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile
index 0dca2b667b..8b6040f1f1 100644
--- a/packages/fcl-xml/Makefile
+++ b/packages/fcl-xml/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2427,7 +2427,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile
index 2f03a70814..fb42ce7f7c 100644
--- a/packages/fftw/Makefile
+++ b/packages/fftw/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2115,7 +2115,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fpgtk/Makefile b/packages/fpgtk/Makefile
index 90a3616647..d90d9fb376 100644
--- a/packages/fpgtk/Makefile
+++ b/packages/fpgtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2680,7 +2680,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile
index 0e70069aae..4e018e819f 100644
--- a/packages/fpmkunit/Makefile
+++ b/packages/fpmkunit/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2365,7 +2365,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fv/Makefile b/packages/fv/Makefile
index 6a2aa5efcf..119f9d74fd 100644
--- a/packages/fv/Makefile
+++ b/packages/fv/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2480,7 +2480,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/fv/examples/Makefile b/packages/fv/examples/Makefile
index b495292392..f88e414021 100644
--- a/packages/fv/examples/Makefile
+++ b/packages/fv/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile
index ec41d0bb0e..4a3d54d974 100644
--- a/packages/gdbint/Makefile
+++ b/packages/gdbint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2710,7 +2710,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/gdbm/Makefile b/packages/gdbm/Makefile
index 4b6863832c..10bbf3a231 100644
--- a/packages/gdbm/Makefile
+++ b/packages/gdbm/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2307,7 +2307,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile
index 56c935a3fe..11f144a356 100644
--- a/packages/ggi/Makefile
+++ b/packages/ggi/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/gnome1/Makefile b/packages/gnome1/Makefile
index 3da9667475..f18fc09914 100644
--- a/packages/gnome1/Makefile
+++ b/packages/gnome1/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2486,7 +2486,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/graph/Makefile b/packages/graph/Makefile
index 2b66b33fca..7d7771836a 100644
--- a/packages/graph/Makefile
+++ b/packages/graph/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2501,7 +2501,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/gtk1/Makefile b/packages/gtk1/Makefile
index d53483d86e..ec4fb557f5 100644
--- a/packages/gtk1/Makefile
+++ b/packages/gtk1/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2302,7 +2302,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/gtk1/examples/Makefile b/packages/gtk1/examples/Makefile
index e7ae21071c..46f3fab24b 100644
--- a/packages/gtk1/examples/Makefile
+++ b/packages/gtk1/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk1/examples/tutorial/Makefile b/packages/gtk1/examples/tutorial/Makefile
index d832c160c7..f0bdabb3a8 100644
--- a/packages/gtk1/examples/tutorial/Makefile
+++ b/packages/gtk1/examples/tutorial/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile
index 9ce7310c26..389fe04cc2 100644
--- a/packages/gtk2/Makefile
+++ b/packages/gtk2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2575,7 +2575,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/gtk2/examples/Makefile b/packages/gtk2/examples/Makefile
index f278d38ff8..88bff4b35b 100644
--- a/packages/gtk2/examples/Makefile
+++ b/packages/gtk2/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/gettingstarted/Makefile b/packages/gtk2/examples/gettingstarted/Makefile
index e4a5700092..95931a82c4 100644
--- a/packages/gtk2/examples/gettingstarted/Makefile
+++ b/packages/gtk2/examples/gettingstarted/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/gtk_demo/Makefile b/packages/gtk2/examples/gtk_demo/Makefile
index 3128aa0a94..301ee0ed41 100644
--- a/packages/gtk2/examples/gtk_demo/Makefile
+++ b/packages/gtk2/examples/gtk_demo/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/gtkglext/Makefile b/packages/gtk2/examples/gtkglext/Makefile
index c81410950d..580e03e0cb 100644
--- a/packages/gtk2/examples/gtkglext/Makefile
+++ b/packages/gtk2/examples/gtkglext/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/helloworld/Makefile b/packages/gtk2/examples/helloworld/Makefile
index 3fde7b4fe3..fb08bb48ae 100644
--- a/packages/gtk2/examples/helloworld/Makefile
+++ b/packages/gtk2/examples/helloworld/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/helloworld2/Makefile b/packages/gtk2/examples/helloworld2/Makefile
index c28ecf1fc8..9a32f78b31 100644
--- a/packages/gtk2/examples/helloworld2/Makefile
+++ b/packages/gtk2/examples/helloworld2/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/plugins/Makefile b/packages/gtk2/examples/plugins/Makefile
index abe0f1a49e..4a956e58ad 100644
--- a/packages/gtk2/examples/plugins/Makefile
+++ b/packages/gtk2/examples/plugins/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/gtk2/examples/scribble_simple/Makefile b/packages/gtk2/examples/scribble_simple/Makefile
index 2734136c57..42654619d7 100644
--- a/packages/gtk2/examples/scribble_simple/Makefile
+++ b/packages/gtk2/examples/scribble_simple/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/hash/Makefile b/packages/hash/Makefile
index 2572dd6d42..10f05423b5 100644
--- a/packages/hash/Makefile
+++ b/packages/hash/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2131,7 +2131,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/httpd13/Makefile b/packages/httpd13/Makefile
index 23c14ac73f..b41ad55aea 100644
--- a/packages/httpd13/Makefile
+++ b/packages/httpd13/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2150,7 +2150,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/httpd20/Makefile b/packages/httpd20/Makefile
index 4fa099b948..127a87528a 100644
--- a/packages/httpd20/Makefile
+++ b/packages/httpd20/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/httpd20/examples/Makefile b/packages/httpd20/examples/Makefile
index 518fd4bdbe..13031b3ba5 100644
--- a/packages/httpd20/examples/Makefile
+++ b/packages/httpd20/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/httpd22/Makefile b/packages/httpd22/Makefile
index 95d7a18d6f..612e7a0cce 100644
--- a/packages/httpd22/Makefile
+++ b/packages/httpd22/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/httpd22/examples/Makefile b/packages/httpd22/examples/Makefile
index 94584cecbc..05370f4fe3 100644
--- a/packages/httpd22/examples/Makefile
+++ b/packages/httpd22/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile
index e64cfb8f80..7e9f3751fd 100644
--- a/packages/ibase/Makefile
+++ b/packages/ibase/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/imagemagick/Makefile b/packages/imagemagick/Makefile
index a9edba3a98..b37533ff90 100644
--- a/packages/imagemagick/Makefile
+++ b/packages/imagemagick/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2327,7 +2327,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/imlib/Makefile b/packages/imlib/Makefile
index 85d7e4a756..8a84efaf73 100644
--- a/packages/imlib/Makefile
+++ b/packages/imlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2405,7 +2405,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/ldap/Makefile b/packages/ldap/Makefile
index c64cfedf3a..d947fc350d 100644
--- a/packages/ldap/Makefile
+++ b/packages/ldap/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2197,7 +2197,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/libc/Makefile b/packages/libc/Makefile
index d8b9ef72bf..ebd0299957 100644
--- a/packages/libc/Makefile
+++ b/packages/libc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2152,7 +2152,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/libcurl/Makefile b/packages/libcurl/Makefile
index 915efc9f49..a4170431dc 100644
--- a/packages/libcurl/Makefile
+++ b/packages/libcurl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/libgd/Makefile b/packages/libgd/Makefile
index ea0ef25fd2..96ff6e154a 100644
--- a/packages/libgd/Makefile
+++ b/packages/libgd/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/libpng/Makefile b/packages/libpng/Makefile
index 9676054678..1352441ac7 100644
--- a/packages/libpng/Makefile
+++ b/packages/libpng/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2236,7 +2236,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/lua/Makefile b/packages/lua/Makefile
index 4c84855156..46a7a668c9 100644
--- a/packages/lua/Makefile
+++ b/packages/lua/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2115,7 +2115,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/mad/Makefile b/packages/mad/Makefile
index 9b49e47ce0..3174cfd7d5 100644
--- a/packages/mad/Makefile
+++ b/packages/mad/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/modplug/Makefile b/packages/modplug/Makefile
index de65104045..eefb1467a6 100644
--- a/packages/modplug/Makefile
+++ b/packages/modplug/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile
index 27c0da182b..4f5e7e15de 100644
--- a/packages/mysql/Makefile
+++ b/packages/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile
index 1fca2fb56c..f244b343e8 100644
--- a/packages/ncurses/Makefile
+++ b/packages/ncurses/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/newt/Makefile b/packages/newt/Makefile
index 824c6a5520..29a4031a82 100644
--- a/packages/newt/Makefile
+++ b/packages/newt/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile
index b23f02c424..642f1292e6 100644
--- a/packages/numlib/Makefile
+++ b/packages/numlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/odbc/Makefile b/packages/odbc/Makefile
index 9765664170..cd7e021932 100644
--- a/packages/odbc/Makefile
+++ b/packages/odbc/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/oggvorbis/Makefile b/packages/oggvorbis/Makefile
index 61d8c5fd73..25a1111758 100644
--- a/packages/oggvorbis/Makefile
+++ b/packages/oggvorbis/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/openal/Makefile b/packages/openal/Makefile
index 2c35a9ecde..42e1a00fe3 100644
--- a/packages/openal/Makefile
+++ b/packages/openal/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2305,7 +2305,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/openal/examples/Makefile b/packages/openal/examples/Makefile
index c6ff46d796..bb3c49a981 100644
--- a/packages/openal/examples/Makefile
+++ b/packages/openal/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile
index d003764b67..5a2f5be0c7 100644
--- a/packages/opengl/Makefile
+++ b/packages/opengl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2390,7 +2390,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile
index f3c6d7cd0e..62488e6eef 100644
--- a/packages/opengl/examples/Makefile
+++ b/packages/opengl/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile
index e577052666..483f5d4c62 100644
--- a/packages/openssl/Makefile
+++ b/packages/openssl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile
index 9bc618d192..c29b374330 100644
--- a/packages/oracle/Makefile
+++ b/packages/oracle/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/oracle/examples/Makefile b/packages/oracle/examples/Makefile
index b5bd29c41a..d9cbd2cf78 100644
--- a/packages/oracle/examples/Makefile
+++ b/packages/oracle/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/os2units/Makefile b/packages/os2units/Makefile
index a030d2bb39..cbe44ba8b8 100644
--- a/packages/os2units/Makefile
+++ b/packages/os2units/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/os2units/examples/Makefile b/packages/os2units/examples/Makefile
index 035ad30b13..6a744fea7e 100644
--- a/packages/os2units/examples/Makefile
+++ b/packages/os2units/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/palmunits/Makefile b/packages/palmunits/Makefile
index 7edf728e97..57e4a1142b 100644
--- a/packages/palmunits/Makefile
+++ b/packages/palmunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile
index c5c05357ac..4f862e7df8 100644
--- a/packages/pasjpeg/Makefile
+++ b/packages/pasjpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2305,7 +2305,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile
index 8bd83669ab..7ea4b49e6b 100644
--- a/packages/paszlib/Makefile
+++ b/packages/paszlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2389,7 +2389,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/paszlib/examples/Makefile b/packages/paszlib/examples/Makefile
index ec049f087c..f75ec6595d 100644
--- a/packages/paszlib/examples/Makefile
+++ b/packages/paszlib/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile
index dfa8f79a01..9d528c8c52 100644
--- a/packages/pcap/Makefile
+++ b/packages/pcap/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile
index 4700b02a76..2dd555aa42 100644
--- a/packages/postgres/Makefile
+++ b/packages/postgres/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/pthreads/Makefile b/packages/pthreads/Makefile
index 00f823bcae..a52aa00e2c 100644
--- a/packages/pthreads/Makefile
+++ b/packages/pthreads/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile
index 7d0b46dd1a..f09595ee90 100644
--- a/packages/pxlib/Makefile
+++ b/packages/pxlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -1927,7 +1927,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile
index ecb8edc064..917c108c4a 100644
--- a/packages/regexpr/Makefile
+++ b/packages/regexpr/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2479,7 +2479,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile
index af1c4494dc..e0ea0cf652 100644
--- a/packages/rexx/Makefile
+++ b/packages/rexx/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2305,7 +2305,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/rexx/examples/Makefile b/packages/rexx/examples/Makefile
index 0ed3e92a39..0d2cbddf39 100644
--- a/packages/rexx/examples/Makefile
+++ b/packages/rexx/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile
index a34fa53c14..a74b4b0ef6 100644
--- a/packages/sdl/Makefile
+++ b/packages/sdl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2318,7 +2318,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile
index 2ae2d35a67..6860e31e6b 100644
--- a/packages/sqlite/Makefile
+++ b/packages/sqlite/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2115,7 +2115,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile
index 05e8bdb1dc..d04f7e839a 100644
--- a/packages/svgalib/Makefile
+++ b/packages/svgalib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile
index d9e45885ba..a0eadc8146 100644
--- a/packages/syslog/Makefile
+++ b/packages/syslog/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2342,7 +2342,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/tcl/Makefile b/packages/tcl/Makefile
index ad37af4704..a56c518257 100644
--- a/packages/tcl/Makefile
+++ b/packages/tcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2484,7 +2484,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/univint/Makefile b/packages/univint/Makefile
index 8c6634c17e..66c77f6e93 100644
--- a/packages/univint/Makefile
+++ b/packages/univint/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/24]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2480,7 +2480,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/univint/examples/Makefile b/packages/univint/examples/Makefile
index df793bdf2a..c624246cdc 100644
--- a/packages/univint/examples/Makefile
+++ b/packages/univint/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/unixutil/Makefile b/packages/unixutil/Makefile
index 39826bee07..6f95da02de 100644
--- a/packages/unixutil/Makefile
+++ b/packages/unixutil/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2548,7 +2548,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile
index 83c1e9afa6..78dfe6de92 100644
--- a/packages/unzip/Makefile
+++ b/packages/unzip/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2113,7 +2113,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/users/Makefile b/packages/users/Makefile
index 4e8e5fa32e..2bcbf21327 100644
--- a/packages/users/Makefile
+++ b/packages/users/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2344,7 +2344,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile
index 3bc85e2ba1..757cfcb1e1 100644
--- a/packages/utmp/Makefile
+++ b/packages/utmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2305,7 +2305,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/uuid/Makefile b/packages/uuid/Makefile
index 2411de60c6..a59b257b2b 100644
--- a/packages/uuid/Makefile
+++ b/packages/uuid/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2479,7 +2479,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/winceunits/Makefile b/packages/winceunits/Makefile
index 41d5a628ed..7d2c88ca9a 100644
--- a/packages/winceunits/Makefile
+++ b/packages/winceunits/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -1955,7 +1955,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/winunits-base/Makefile b/packages/winunits-base/Makefile
index 8edd915fa2..c5550cf036 100644
--- a/packages/winunits-base/Makefile
+++ b/packages/winunits-base/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2654,7 +2654,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/winunits-jedi/Makefile b/packages/winunits-jedi/Makefile
index 3307af9e19..4df6a0d21f 100644
--- a/packages/winunits-jedi/Makefile
+++ b/packages/winunits-jedi/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -3030,7 +3030,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/x11/Makefile b/packages/x11/Makefile
index 33a870691f..a6736a6c20 100644
--- a/packages/x11/Makefile
+++ b/packages/x11/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2152,7 +2152,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/xforms/Makefile b/packages/xforms/Makefile
index fb3ece3648..291c955ece 100644
--- a/packages/xforms/Makefile
+++ b/packages/xforms/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2619,7 +2619,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/packages/xforms/examples/Makefile b/packages/xforms/examples/Makefile
index 6102bdea74..c4f9836a72 100644
--- a/packages/xforms/examples/Makefile
+++ b/packages/xforms/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile
index 617b9eb6eb..a44366b223 100644
--- a/packages/zlib/Makefile
+++ b/packages/zlib/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2150,7 +2150,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/rtl/Makefile b/rtl/Makefile
index aa73f85a14..5c87d40395 100644
--- a/rtl/Makefile
+++ b/rtl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -1434,7 +1434,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index f66d33a7d6..580f8e6734 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index 31d2e53f9d..d4dd97326a 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index 6341247475..49c07460f4 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index 23038dbf4e..f7d6f4bdcd 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index 6ffe35a8ad..ceff3b2e61 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 9a090a92ac..d6a670fbb1 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index fd79b63555..f4bd1c634d 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index cb0d0c7b7d..a0372f04b3 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 7c92d84976..b7edad8a3b 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index 50ad95e899..4195ea9f11 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index e533b9fb39..c62b017e37 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index c4163dfd00..9f53682e85 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 23be4001a9..f3cf14bd7a 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index 161ac78386..e8bd32ccce 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index d858be23e3..7ce8632ce8 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 608ca92735..5018f341ad 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index 19b7fc2663..31a6e39b1c 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index ccf4578557..102da41d76 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 9ac7ab0380..3a7c4be881 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index a35c7365fd..aafd1ec975 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index 10c19791ba..08803570af 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/Makefile b/utils/Makefile
index f26e5e1fd0..c58737cca3 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2603,7 +2603,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile
index e9aeed7f69..3390a539c2 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile
index f443a52df9..b4dcf76d3f 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index 285ae11898..e89d37e85c 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -1908,7 +1908,7 @@ ifdef inUnix
         /bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-        $(RUNBATCH) (ZIPWRAPPER)
+        $(RUNBATCH) $(ZIPWRAPPER)
 else
         $(ZIPWRAPPER)
 endif
diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile
index 67bc1c422c..1c4a22fc19 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile
index 697a830e74..dbbbe0ab6d 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2687,7 +2687,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile
index e80d002b41..7c5ba6f144 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile
index a9077d59da..7fae2c566b 100644
--- a/utils/fppkg/Makefile
+++ b/utils/fppkg/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -3501,7 +3501,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif
diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile
index 40795bd1ad..4e4312d93c 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile
index 6a3dee0d3c..2eb3ba3a04 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
diff --git a/utils/tply/Makefile b/utils/tply/Makefile
index 58b3ac53be..5662b741ad 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 [2008/05/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -2306,7 +2306,7 @@ ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
 else
 ifdef RUNBATCH
-	$(RUNBATCH) (ZIPWRAPPER)
+	$(RUNBATCH) $(ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
 endif