diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:20:52 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:20:52 +0000 |
commit | dd73d001919489b7fb0326a2f12597585dd019c5 (patch) | |
tree | 291e8833a97fa40f113e7539fb6e90c66742a967 /zlib | |
parent | e5ce15185e20ceb5523027c74f66b0a8c1356079 (diff) |
INTEGRATION: CWS geordi2q11 (1.4.36); FILE MERGED
2003/12/17 11:42:48 hr 1.4.36.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'zlib')
-rw-r--r-- | zlib/makefile.mk | 12 |
1 files 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 |