* fix for integration with FCL

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2001/04/10]
+# Makefile generated by fpcmake v1.00 [2001/04/11]
 #
 
 defaultrule: all
@@ -220,22 +220,7 @@ endif
 
 # Packages
 
-override PACKAGES+=rtl fcl
-ifeq ($(OS_TARGET),linux)
-override PACKAGES+=zlib
-endif
-ifeq ($(OS_TARGET),go32v2)
-override PACKAGES+=paszlib
-endif
-ifeq ($(OS_TARGET),win32)
-override PACKAGES+=paszlib
-endif
-ifeq ($(OS_TARGET),os2)
-override PACKAGES+=paszlib
-endif
-ifeq ($(OS_TARGET),freebsd)
-override PACKAGES+=zlib
-endif
+override PACKAGES+=rtl fcl paszlib
 
 # Libraries
 
@@ -549,21 +534,7 @@ endif
 
 PACKAGERTL=1
 PACKAGEFCL=1
-ifeq ($(OS_TARGET),linux)
-PACKAGEZLIB=1
-endif
-ifeq ($(OS_TARGET),go32v2)
-PACKAGEPASZLIB=1
-endif
-ifeq ($(OS_TARGET),win32)
 PACKAGEPASZLIB=1
-endif
-ifeq ($(OS_TARGET),os2)
-PACKAGEPASZLIB=1
-endif
-ifeq ($(OS_TARGET),freebsd)
-PACKAGEZLIB=1
-endif
 
 ifdef PACKAGERTL
 ifneq ($(wildcard $(FPCDIR)/rtl),)
@@ -577,7 +548,11 @@ override COMPILEPACKAGES+=package_rtl
 package_rtl:
 	$(MAKE) -C $(PACKAGEDIR_RTL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
 else
 PACKAGEDIR_RTL=
 ifneq ($(wildcard $(UNITSDIR)/rtl),)
@@ -606,7 +581,11 @@ override COMPILEPACKAGES+=package_fcl
 package_fcl:
 	$(MAKE) -C $(PACKAGEDIR_FCL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_FCL)/$(OS_TARGET)),)
+UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
+else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
+endif
 else
 PACKAGEDIR_FCL=
 ifneq ($(wildcard $(UNITSDIR)/fcl),)
@@ -623,35 +602,6 @@ ifdef UNITDIR_FCL
 override NEEDUNITDIR+=$(UNITDIR_FCL)
 endif
 endif
-ifdef PACKAGEZLIB
-ifneq ($(wildcard $(PACKAGESDIR)/zlib),)
-ifneq ($(wildcard $(PACKAGESDIR)/zlib/$(OS_TARGET)/Makefile.fpc),)
-PACKAGEDIR_ZLIB=$(PACKAGESDIR)/zlib/$(OS_TARGET)
-else
-PACKAGEDIR_ZLIB=$(PACKAGESDIR)/zlib
-endif
-ifeq ($(wildcard $(PACKAGEDIR_ZLIB)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_zlib
-package_zlib:
-	$(MAKE) -C $(PACKAGEDIR_ZLIB) all
-endif
-UNITDIR_ZLIB=$(PACKAGEDIR_ZLIB)
-else
-PACKAGEDIR_ZLIB=
-ifneq ($(wildcard $(UNITSDIR)/zlib),)
-ifneq ($(wildcard $(UNITSDIR)/zlib/$(OS_TARGET)),)
-UNITDIR_ZLIB=$(UNITSDIR)/zlib/$(OS_TARGET)
-else
-UNITDIR_ZLIB=$(UNITSDIR)/zlib
-endif
-else
-UNITDIR_ZLIB=
-endif
-endif
-ifdef UNITDIR_ZLIB
-override NEEDUNITDIR+=$(UNITDIR_ZLIB)
-endif
-endif
 ifdef PACKAGEPASZLIB
 ifneq ($(wildcard $(PACKAGESDIR)/paszlib),)
 ifneq ($(wildcard $(PACKAGESDIR)/paszlib/$(OS_TARGET)/Makefile.fpc),)
@@ -664,7 +614,11 @@ override COMPILEPACKAGES+=package_paszlib
 package_paszlib:
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(OS_TARGET)),)
+UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
+else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
+endif
 else
 PACKAGEDIR_PASZLIB=
 ifneq ($(wildcard $(UNITSDIR)/paszlib),)

utils/Makefile.fpc

@@ -14,12 +14,7 @@ packagename=util
 sourcesubdirs=0
 
 [require]
-packages=fcl
-packages_linux=zlib
-packages_os2=paszlib
-packages_win32=paszlib
-packages_go32v2=paszlib
-packages_freebsd=zlib
+packages=fcl paszlib
 
 [tools]
 tooldata2inc=1

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2001/04/10]
+# Makefile generated by fpcmake v1.00 [2001/04/11]
 #
 
 defaultrule: all
@@ -530,7 +530,11 @@ override COMPILEPACKAGES+=package_rtl
 package_rtl:
 	$(MAKE) -C $(PACKAGEDIR_RTL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
 else
 PACKAGEDIR_RTL=
 ifneq ($(wildcard $(UNITSDIR)/rtl),)

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2001/04/10]
+# Makefile generated by fpcmake v1.00 [2001/04/11]
 #
 
 defaultrule: all
@@ -531,7 +531,11 @@ override COMPILEPACKAGES+=package_rtl
 package_rtl:
 	$(MAKE) -C $(PACKAGEDIR_RTL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
 else
 PACKAGEDIR_RTL=
 ifneq ($(wildcard $(UNITSDIR)/rtl),)

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2001/04/10]
+# Makefile generated by fpcmake v1.00 [2001/04/11]
 #
 
 defaultrule: all
@@ -530,7 +530,11 @@ override COMPILEPACKAGES+=package_rtl
 package_rtl:
 	$(MAKE) -C $(PACKAGEDIR_RTL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
 else
 PACKAGEDIR_RTL=
 ifneq ($(wildcard $(UNITSDIR)/rtl),)

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2001/04/10]
+# Makefile generated by fpcmake v1.00 [2001/04/11]
 #
 
 defaultrule: all
@@ -532,7 +532,11 @@ override COMPILEPACKAGES+=package_rtl
 package_rtl:
 	$(MAKE) -C $(PACKAGEDIR_RTL) all
 endif
+ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
+UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
+else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
+endif
 else
 PACKAGEDIR_RTL=
 ifneq ($(wildcard $(UNITSDIR)/rtl),)