From d3006fcd995d93d1bcdfe563ed39638ca7e03e16 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Fri, 3 Dec 1999 10:53:08 +0000
Subject: [PATCH] + Fixes for zstream target

---
 fcl/linux/Makefile     | 36 +++++++++++++++++++++++++++++++-----
 fcl/linux/Makefile.fpc | 21 +++++++++++++++------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile
index 258ddacd4e..524d7dad5d 100644
--- a/fcl/linux/Makefile
+++ b/fcl/linux/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
+# Makefile generated by fpcmake v0.99.13 on 1999-12-03 10:46
 #
 
 defaultrule: all
@@ -147,9 +147,18 @@ XML=../xml
 include $(INC)/Makefile.inc
 include $(XML)/Makefile.inc
 
+# Which package to use
+ifndef ZLIBPACKAGE
+ifdef inlinux
+ZLIBPACKAGE=zlib
+else
+ZLIBPACKAGE=paszlib
+endif
+endif
+
 # Targets
 
-override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS)
+override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zstream
 
 # Clean
 
@@ -181,6 +190,8 @@ endif
 
 # Packages
 
+override PACKAGES+=$(ZLIBPACKAGE)
+override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
 
 # Libraries
 
@@ -307,6 +318,10 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 
+ifdef NEEDUNITDIR
+override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
+endif
+
 ifdef NEEDINCDIR
 override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
 endif
@@ -680,7 +695,18 @@ rtl_package:
 endif
 endif
 
-.PHONY:  rtl_package
+PACKAGE$(ZLIBPACKAGE)=1
+ifdef PACKAGE$(ZLIBPACKAGE)
+ifneq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)),)
+ifeq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)/$(FPCMAKED)),)
+override COMPILEPACKAGES+=$(ZLIBPACKAGE)
+$(ZLIBPACKAGE)_package:
+	$(MAKE) -C $(PACKAGEDIR)/$(ZLIBPACKAGE) all
+endif
+endif
+endif
+
+.PHONY:  rtl_package $(ZLIBPACKAGE)_package
 
 #####################################################################
 # Units
@@ -995,6 +1021,6 @@ INCFILES=$(addprefix $(INC)/,$(INCNAMES))
 
 classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
 
-inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
+inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT)
 
-ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc
+ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)
diff --git a/fcl/linux/Makefile.fpc b/fcl/linux/Makefile.fpc
index 3f6fb3acf0..80a7a85602 100644
--- a/fcl/linux/Makefile.fpc
+++ b/fcl/linux/Makefile.fpc
@@ -1,5 +1,5 @@
 #
-#   Makefile.fpc for Free Component Library for Linux
+#   Makefile.fpc for Free Component Library for Win32
 #
 
 [defaults]
@@ -7,6 +7,9 @@ defaulttarget=linux
 defaultcpu=i386
 defaultoptions=-S2
 
+[packages]
+packages=$(ZLIBPACKAGE)
+
 [dirs]
 fpcdir=../..
 targetdir=.
@@ -14,8 +17,7 @@ incdir=$(INC)
 sourcesdir=$(INC) $(XML)
 
 [targets]
-units=classes $(INCUNITS) $(XMLUNITS)
-
+units=classes $(INCUNITS) $(XMLUNITS) zstream
 
 [presettings]
 # Include files
@@ -27,13 +29,20 @@ XML=../xml
 include $(INC)/Makefile.inc
 include $(XML)/Makefile.inc
 
+# Which package to use
+ifndef ZLIBPACKAGE
+ifdef inlinux
+ZLIBPACKAGE=zlib
+else
+ZLIBPACKAGE=paszlib
+endif
+endif
 
 [rules]
 INCFILES=$(addprefix $(INC)/,$(INCNAMES))
 
 classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
 
-inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
-
-ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc
+inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT)
 
+ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)
\ No newline at end of file