--- a/bc.mak	Wed Mar 28 15:06:31 2007 +0200
+++ b/bc.mak	Wed Mar 28 15:08:20 2007 +0200
@@ -1,6 +1,6 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.91 2007-03-28 13:06:31 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.92 2007-03-28 13:08:20 cg Exp $
 #
-# DO NOT EDIT 
+# DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic2.
 #
 # Warning: once you modify this file, do not rerun
@@ -26,7 +26,7 @@
 LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
-LOCALLIBS=$(ZLIB)
+LOCALLIBS=$(ZLIB_DIR)\$(ZLIB)
 
 
 # see stdHeader_bc for LIBBASIC2_BASE
@@ -36,18 +36,14 @@
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL:: $(ZLIB) $(BINDIR)\$(LIBNAME).dll
+ALL:: $(ZLIB_DIR)\$(ZLIB) $(BINDIR)\$(LIBNAME).dll
 
 !INCLUDE $(TOP)\rules\stdRules_bc
 
 
-$(ZLIB):
+$(ZLIB_DIR)\$(ZLIB):
 	cd $(ZLIB_DIR)
-<<<<<<< bc.mak
-	make $(MAKE_ZLIB_ARG) $(ZLIB)
-=======
-	$(MAKE) $(MAKE_ZLIB_ARG) zlib.lib
->>>>>>> 1.90
+	$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
 	cd ..\..\libbasic2
 
 $(BZ2LIB):