--- a/Make.proto	Mon May 19 13:12:19 2003 +0200
+++ b/Make.proto	Tue May 20 16:59:26 2003 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.114 2003-05-17 14:09:38 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.115 2003-05-20 14:59:26 stefan Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -104,10 +104,10 @@
 objs::  $(OBJS)
 
 zlib:  
-	cd ../support/zlib; make
+	cd ../support/zlib; $(MAKE)
 
 bz2lib: 
-	cd ../support/bz2lib; make libbz2.a
+	cd ../support/bz2lib; $(MAKE) libbz2.a
 
 #
 # these nest too deep on some (sco & isc) systems (see discussion about LIMITSUPERINCLUDE

--- a/Stack.st	Mon May 19 13:12:19 2003 +0200
+++ b/Stack.st	Tue May 20 16:59:26 2003 +0200
@@ -1,4 +1,4 @@
-"{ Package: 'stx:goodies/tgen' }"
+"{ Package: 'stx:libbasic2' }"
 
 OrderedCollection subclass:#Stack
 	instanceVariableNames:''
@@ -105,5 +105,5 @@
 !Stack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Stack.st,v 1.4 2002-09-30 15:59:25 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Stack.st,v 1.5 2003-05-20 14:59:26 stefan Exp $'
 ! !

--- a/abbrev.stc	Mon May 19 13:12:19 2003 +0200
+++ b/abbrev.stc	Tue May 20 16:59:26 2003 +0200
@@ -70,6 +70,7 @@
 Socket Socket stx:libbasic2 'Streams-External'
 SocketAddress SocketAddress stx:libbasic2 'OS-Sockets'
 SocketAddressInfo SocketAddressInfo stx:libbasic2 'OS-Sockets'
+SocketTest SocketTest stx:libbasic2 'Streams-Sockets'
 SoundStream SoundStream stx:libbasic2 'Streams-External'
 Spline Spline stx:libbasic2 'Graphics-Geometry'
 SplittingWriteStream SplittingWriteStream stx:libbasic2 'Streams-Misc'