$OpenBSD: patch-j2se_make_java_zip_Makefile,v 1.1 2007/09/06 15:46:18 kurt Exp $
--- j2se/make/java/zip/Makefile.orig	Sun Jul 15 22:34:44 2007
+++ j2se/make/java/zip/Makefile	Sun Jul 15 22:36:10 2007
@@ -78,14 +78,17 @@ else
 CPPFLAGS += -UDEBUG 
 endif
 
-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 CPPFLAGS += -I$(SHARE_SRC)/native/java/io
 CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
 
+ifneq ($(SYSTEM_ZLIB),true)
+CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+
 #
 # Add to ambient vpath so we pick up the library files
 #
 vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+endif
 
 #
 # Has been converted to the JNI: generate JNI-style header files
@@ -95,4 +98,9 @@ JAVAHFLAGS += -jni
 #
 # Link to JVM library for JVM_Zip* functions
 #
+ifeq ($(SYSTEM_ZLIB),true)
+OTHER_LDLIBS = -lz
+else
 OTHER_LDLIBS = $(JVMLIB)
+endif
+
