--- a/Make.proto	Wed Jan 26 14:55:27 2005 +0100
+++ b/Make.proto	Fri Jan 28 10:11:31 2005 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.125 2004-12-20 19:57:03 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.126 2005-01-28 09:11:31 cg Exp $
 #
 
 TOP=..
@@ -10,30 +10,17 @@
 STCOPT=$(LIBBASIC2_STCOPT)
 STCLOCALOPT='-package=$(PACKAGE)' $(COMMONSYMBOLS) $(SEPINITCODE) -varPrefix=$(LIBNAME) -I../support
 LINKOBJRULE=$(SEPINITLINKOBJRULE)
-LD_OBJ_LIBS=-L../support/zlib -lz -L../support/bz2lib -lbz2
+LD_OBJ_LIBS=$(ZLIB_LD_ARG) $(BZ2LIB_LD_ARG)
 
-all::  zlib bz2lib classLibRule
+all::  $(ZLIB_MAKE_TARGET) $(BZ2LIB_MAKE_TARGET) classLibRule
 
 objs::  $(OBJS)
 
 zlib:
-	cd ../support/zlib; $(MAKE)
+	cd $(ZLIB_DIR); $(MAKE)
 
 bz2lib:
-	cd ../support/bz2lib; $(MAKE) libbz2.a
-
-#
-# these nest too deep on some (sco & isc) systems (see discussion about LIMITSUPERINCLUDE
-# in configurations/COMMON/defines)
-#
-# PSPRSTR:
-#       @$(MAKE) PSPrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE) +optspace2"
-#
-# HPIIPRSTR:
-#       @$(MAKE) HPIIPrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE) +optspace2"
-#
-# FX1PRSTR:
-#       @$(MAKE) FX1PrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE) +optspace2"
+	cd $(BZ2LIB_DIR); $(MAKE) libbz2.a
 
 cleanjunk::
 	@-rm -f *.s *.s2 *.c *.H