From 3894df62ff733c06eb3dff3aa44012e2c96bba48 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Sun, 8 Aug 2004 17:03:59 +0000
Subject: [PATCH] + Patch from Vincent Snijders to fix Win32 install

---
 fcl/db/dbase/Makefile     | 10 ++++++++--
 fcl/db/dbase/Makefile.fpc | 20 +++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/fcl/db/dbase/Makefile b/fcl/db/dbase/Makefile
index 5d174a712e..267fd49713 100644
--- a/fcl/db/dbase/Makefile
+++ b/fcl/db/dbase/Makefile
@@ -215,14 +215,20 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fcl
 ifeq ($(CPU_TARGET),i386)
+ifneq ($(OS_TARGET),win32)
+INSTALL_UNITS+=Dbf_Wtil
+CLEAN_UNITS+=Dbf_Wtil
+endif
+endif
+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
+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
 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
+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
 endif
 override INSTALL_FPCPACKAGE=y
 override COMPILER_OPTIONS+=-S2 -Sh
diff --git a/fcl/db/dbase/Makefile.fpc b/fcl/db/dbase/Makefile.fpc
index 182394c2cb..7c8f228cc7 100644
--- a/fcl/db/dbase/Makefile.fpc
+++ b/fcl/db/dbase/Makefile.fpc
@@ -13,16 +13,26 @@ examples_i386=testdbf
 options=-S2 -Sh
 targetdir=../../$(OS_TARGET)
 
+[default]
+fpcdir=../../..
+
 [install]
 fpcpackage=y
 units_i386=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
-
-[default]
-fpcdir=../../..
+      Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
 
 [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
+      Dbf_PrsCore Dbf_PrsDef Dbf_PrsSupp Dbf_Str
+
+[prerules]
+# Dbf_Wtil is needed on all targets except win32
+ifeq ($(CPU_TARGET),i386)
+ifneq ($(OS_TARGET),win32)
+INSTALL_UNITS+=Dbf_Wtil
+CLEAN_UNITS+=Dbf_Wtil
+endif
+endif
+