From dd73d001919489b7fb0326a2f12597585dd019c5 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 17 Dec 2003 19:20:52 +0000
Subject: [PATCH] INTEGRATION: CWS geordi2q11 (1.4.36); FILE MERGED 2003/12/17
 11:42:48 hr 1.4.36.1: #111934#: join CWS ooo111fix1

---
 zlib/makefile.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index 75fab9265950..44a0c1da3d34 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hr $ $Date: 2003-03-27 18:13:15 $
+#   last change: $Author: vg $ $Date: 2003-12-17 20:20:52 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -65,6 +65,14 @@ PRJ=.
 PRJNAME=zlib
 TARGET=zlib
 
+.IF "$(GUI)" == "UNX"
+.IF "$(SYSTEM_ZLIB)" == "YES"
+all:
+    @echo "An already available installation of zlib should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+.ENDIF
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk