Index: fpc-1.9/fcl/db/dbase/Makefile
===================================================================
RCS file: /FPC/CVS/fpc/fcl/db/dbase/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- fpc-1.9/fcl/db/dbase/Makefile	24 Jul 2004 18:20:10 -0000	1.55
+++ fpc-1.9/fcl/db/dbase/Makefile	30 Jul 2004 21:53:02 -0000
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/23]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/30]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
@@ -214,8 +214,12 @@
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
-override TARGET_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
+ifeq ($(CPU_TARGET),i386)
+override TARGET_UNITS+=Dbf
+endif
+ifeq ($(CPU_TARGET),i386)
 override TARGET_EXAMPLES+=testdbf
+endif
 override CLEAN_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
 ifeq ($(CPU_TARGET),i386)
 override INSTALL_UNITS+=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
Index: fpc-1.9/fcl/db/dbase/Makefile.fpc
===================================================================
RCS file: /FPC/CVS/fpc/fcl/db/dbase/Makefile.fpc,v
retrieving revision 1.8
diff -u -r1.8 Makefile.fpc
--- fpc-1.9/fcl/db/dbase/Makefile.fpc	24 Jul 2004 18:20:10 -0000	1.8
+++ fpc-1.9/fcl/db/dbase/Makefile.fpc	30 Jul 2004 21:53:02 -0000
@@ -6,10 +6,8 @@
 main=fcl
 
 [target]
-units_x86=Dbf_Common Dbf_Cursor Dbf_DbfFile Dbf_Fields Dbf_IdxCur \
-      Dbf_IdxFile Dbf_Lang Dbf_Memo Dbf_Parser Dbf_PgFile \
-      Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str Dbf_Wtil
-examples_x86=testdbf
+units_i386=Dbf
+examples_i386=testdbf
 
 [compiler]
 options=-S2 -Sh
Index: fpc-1.9/utils/fpcm/fpcmwr.pp
===================================================================
RCS file: /FPC/CVS/fpc/utils/fpcm/fpcmwr.pp,v
retrieving revision 1.32
diff -u -r1.32 fpcmwr.pp
--- fpc-1.9/utils/fpcm/fpcmwr.pp	12 Jul 2004 06:42:52 -0000	1.32
+++ fpc-1.9/utils/fpcm/fpcmwr.pp	30 Jul 2004 21:53:14 -0000
@@ -278,6 +278,7 @@
     function TMakefileWriter.CheckTargetVariable(const inivar:string):boolean;
       var
         t : TTarget;
+        c : TCpu;
       begin
         result:=false;
         if FInput.GetVariable(IniVar,false)<>'' then
@@ -288,6 +289,13 @@
         for t:=low(TTarget) to high(TTarget) do
          if (t in FInput.IncludeTargets) and
             (FInput.GetVariable(IniVar+TargetSuffix[t],false)<>'') then
+          begin
+            result:=true;
+            exit;
+          end;
+        for c:=low(TCpu) to high(TCpu) do
+         if (c in FInput.IncludeCpus) and
+            (FInput.GetVariable(IniVar+CpuSuffix[c],false)<>'') then
           begin
             result:=true;
             exit;
