diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile
index 9888bf627b..eb47b0737e 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 [2009/08/02]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/20]
 #
 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
@@ -267,7 +267,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=fcl-db
 override PACKAGE_VERSION=2.5.1
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen  src/dbase
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -279,19 +279,19 @@ ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/datadict src/codegen  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/datadict src/codegen  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/datadict src/codegen  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -306,7 +306,7 @@ ifeq ($(FULL_TARGET),i386-wdosx)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -327,10 +327,10 @@ ifeq ($(FULL_TARGET),i386-symbian)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox
@@ -351,7 +351,7 @@ ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox
@@ -363,7 +363,7 @@ ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -372,25 +372,25 @@ ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen  src/dbase
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/datadict src/codegen  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/export src/datadict src/codegen
@@ -399,13 +399,13 @@ ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen  src/dbase
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite  src/dbase src/export
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/export src/datadict src/codegen
@@ -423,10 +423,10 @@ ifeq ($(FULL_TARGET),arm-symbian)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -435,7 +435,7 @@ ifeq ($(FULL_TARGET),avr-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base  src/sqlite src/paradox src/export src/datadict src/codegen
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
@@ -2690,12 +2690,12 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 TARGET_DIRS_SRC/SDF=1
@@ -2726,36 +2726,36 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
-TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
-TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
 TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
-TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_SRC/SDF=1
@@ -2771,8 +2771,9 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 TARGET_DIRS_SRC/SDF=1
@@ -2806,8 +2807,9 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_SRC/SDF=1
@@ -2855,7 +2857,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
@@ -2867,10 +2868,8 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
-TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
 endif
@@ -2921,7 +2920,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
@@ -2954,7 +2952,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
@@ -2974,7 +2971,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
@@ -2995,7 +2991,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
@@ -3009,32 +3004,33 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
-TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_SRC/SDF=1
@@ -3057,12 +3053,12 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
 TARGET_DIRS_SRC/DATADICT=1
 TARGET_DIRS_SRC/CODEGEN=1
+TARGET_DIRS_SRC/DBASE=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_SRC/SDF=1
@@ -3075,8 +3071,9 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
+TARGET_DIRS_SRC/DBASE=1
+TARGET_DIRS_SRC/EXPORT=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_SRC/SDF=1
@@ -3118,7 +3115,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
@@ -3130,7 +3126,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
@@ -3150,7 +3145,6 @@ TARGET_DIRS_SRC/SDF=1
 TARGET_DIRS_SRC/MEMDS=1
 TARGET_DIRS_SRC/SQLDB=1
 TARGET_DIRS_SRC/BASE=1
-TARGET_DIRS_SRC/DBASE=1
 TARGET_DIRS_SRC/SQLITE=1
 TARGET_DIRS_SRC/PARADOX=1
 TARGET_DIRS_SRC/EXPORT=1
@@ -3343,51 +3337,6 @@ src/base:
 	$(MAKE) -C src/base all
 .PHONY: src/base_all src/base_debug src/base_smart src/base_release src/base_units src/base_examples src/base_shared src/base_install src/base_sourceinstall src/base_exampleinstall src/base_distinstall src/base_zipinstall src/base_zipsourceinstall src/base_zipexampleinstall src/base_zipdistinstall src/base_clean src/base_distclean src/base_cleanall src/base_info src/base_makefiles src/base
 endif
-ifdef TARGET_DIRS_SRC/DBASE
-src/dbase_all:
-	$(MAKE) -C src/dbase all
-src/dbase_debug:
-	$(MAKE) -C src/dbase debug
-src/dbase_smart:
-	$(MAKE) -C src/dbase smart
-src/dbase_release:
-	$(MAKE) -C src/dbase release
-src/dbase_units:
-	$(MAKE) -C src/dbase units
-src/dbase_examples:
-	$(MAKE) -C src/dbase examples
-src/dbase_shared:
-	$(MAKE) -C src/dbase shared
-src/dbase_install:
-	$(MAKE) -C src/dbase install
-src/dbase_sourceinstall:
-	$(MAKE) -C src/dbase sourceinstall
-src/dbase_exampleinstall:
-	$(MAKE) -C src/dbase exampleinstall
-src/dbase_distinstall:
-	$(MAKE) -C src/dbase distinstall
-src/dbase_zipinstall:
-	$(MAKE) -C src/dbase zipinstall
-src/dbase_zipsourceinstall:
-	$(MAKE) -C src/dbase zipsourceinstall
-src/dbase_zipexampleinstall:
-	$(MAKE) -C src/dbase zipexampleinstall
-src/dbase_zipdistinstall:
-	$(MAKE) -C src/dbase zipdistinstall
-src/dbase_clean:
-	$(MAKE) -C src/dbase clean
-src/dbase_distclean:
-	$(MAKE) -C src/dbase distclean
-src/dbase_cleanall:
-	$(MAKE) -C src/dbase cleanall
-src/dbase_info:
-	$(MAKE) -C src/dbase info
-src/dbase_makefiles:
-	$(MAKE) -C src/dbase makefiles
-src/dbase:
-	$(MAKE) -C src/dbase all
-.PHONY: src/dbase_all src/dbase_debug src/dbase_smart src/dbase_release src/dbase_units src/dbase_examples src/dbase_shared src/dbase_install src/dbase_sourceinstall src/dbase_exampleinstall src/dbase_distinstall src/dbase_zipinstall src/dbase_zipsourceinstall src/dbase_zipexampleinstall src/dbase_zipdistinstall src/dbase_clean src/dbase_distclean src/dbase_cleanall src/dbase_info src/dbase_makefiles src/dbase
-endif
 ifdef TARGET_DIRS_SRC/SQLITE
 src/sqlite_all:
 	$(MAKE) -C src/sqlite all
@@ -3613,6 +3562,51 @@ src/codegen:
 	$(MAKE) -C src/codegen all
 .PHONY: src/codegen_all src/codegen_debug src/codegen_smart src/codegen_release src/codegen_units src/codegen_examples src/codegen_shared src/codegen_install src/codegen_sourceinstall src/codegen_exampleinstall src/codegen_distinstall src/codegen_zipinstall src/codegen_zipsourceinstall src/codegen_zipexampleinstall src/codegen_zipdistinstall src/codegen_clean src/codegen_distclean src/codegen_cleanall src/codegen_info src/codegen_makefiles src/codegen
 endif
+ifdef TARGET_DIRS_SRC/DBASE
+src/dbase_all:
+	$(MAKE) -C src/dbase all
+src/dbase_debug:
+	$(MAKE) -C src/dbase debug
+src/dbase_smart:
+	$(MAKE) -C src/dbase smart
+src/dbase_release:
+	$(MAKE) -C src/dbase release
+src/dbase_units:
+	$(MAKE) -C src/dbase units
+src/dbase_examples:
+	$(MAKE) -C src/dbase examples
+src/dbase_shared:
+	$(MAKE) -C src/dbase shared
+src/dbase_install:
+	$(MAKE) -C src/dbase install
+src/dbase_sourceinstall:
+	$(MAKE) -C src/dbase sourceinstall
+src/dbase_exampleinstall:
+	$(MAKE) -C src/dbase exampleinstall
+src/dbase_distinstall:
+	$(MAKE) -C src/dbase distinstall
+src/dbase_zipinstall:
+	$(MAKE) -C src/dbase zipinstall
+src/dbase_zipsourceinstall:
+	$(MAKE) -C src/dbase zipsourceinstall
+src/dbase_zipexampleinstall:
+	$(MAKE) -C src/dbase zipexampleinstall
+src/dbase_zipdistinstall:
+	$(MAKE) -C src/dbase zipdistinstall
+src/dbase_clean:
+	$(MAKE) -C src/dbase clean
+src/dbase_distclean:
+	$(MAKE) -C src/dbase distclean
+src/dbase_cleanall:
+	$(MAKE) -C src/dbase cleanall
+src/dbase_info:
+	$(MAKE) -C src/dbase info
+src/dbase_makefiles:
+	$(MAKE) -C src/dbase makefiles
+src/dbase:
+	$(MAKE) -C src/dbase all
+.PHONY: src/dbase_all src/dbase_debug src/dbase_smart src/dbase_release src/dbase_units src/dbase_examples src/dbase_shared src/dbase_install src/dbase_sourceinstall src/dbase_exampleinstall src/dbase_distinstall src/dbase_zipinstall src/dbase_zipsourceinstall src/dbase_zipexampleinstall src/dbase_zipdistinstall src/dbase_clean src/dbase_distclean src/dbase_cleanall src/dbase_info src/dbase_makefiles src/dbase
+endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))
diff --git a/packages/fcl-db/Makefile.fpc b/packages/fcl-db/Makefile.fpc
index 2a5c9c3d76..7fbe75ec11 100644
--- a/packages/fcl-db/Makefile.fpc
+++ b/packages/fcl-db/Makefile.fpc
@@ -8,12 +8,26 @@ version=2.5.1
 
 [target]
 dirs=src/sdf src/memds src/sqldb src/base 
-dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
-dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
-dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen 
-dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
-dirs_darwin=src/dbase src/sqlite
-dirs_solaris=src/dbase src/sqlite
+dirs_beos=src/sqlite src/paradox src/datadict src/codegen
+dirs_beos_i386=src/dbase src/export
+dirs_beos_x86_64=src/dbase src/export
+dirs_haiku=src/sqlite src/paradox src/datadict src/codegen
+dirs_haiku_i386=src/dbase src/export
+dirs_haiku_x86_64=src/dbase src/export
+dirs_linux=src/sqlite src/paradox src/export src/datadict src/codegen 
+dirs_linux_i386=src/dbase
+dirs_linux_x86_64=src/dbase
+dirs_linux_arm=src/dbase
+dirs_linux_armel=src/dbase
+dirs_freebsd=src/sqlite src/paradox src/datadict src/codegen
+dirs_freebsd_i386=src/dbase src/export
+dirs_freebsd_x86_64=src/dbase src/export
+dirs_darwin=src/sqlite
+dirs_darwin_i386=src/dbase src/export
+dirs_darwin_x86_64=src/dbase src/export
+dirs_darwin_arm=src/dbase src/export
+dirs_solaris=src/sqlite
+dirs_solaris_i386=src/dbase src/export
 dirs_netbsd=src/dbase src/sqlite src/paradox
 dirs_openbsd=src/dbase src/sqlite src/paradox
 dirs_win32=src/dbase src/paradox src/sqlite src/export src/datadict src/codegen