summaryrefslogtreecommitdiff
path: root/neon
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-08 15:51:17 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-08 15:51:17 +0000
commita2df3409e88948c9cde18107372bad5aed4e79e5 (patch)
treebcb03edd96ddcfc2837d01bba48c117527328785 /neon
parentcc6f113d14dd603ce0b1ba70a152b5b449e3c6e1 (diff)
INTEGRATION: CWS ooo20040704 (1.5.74); FILE MERGED
2004/07/06 12:37:36 rene 1.5.74.1: #i23779# Patch to use system libs - disable neon build if SYSTEM_NEON is set Issue number: Submitted by: Reviewed by:
Diffstat (limited to 'neon')
-rw-r--r--neon/makefile.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/neon/makefile.mk b/neon/makefile.mk
index cbbb36bad538..db2c81a52acf 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: kso $ $Date: 2002-10-24 11:50:58 $
+# last change: $Author: rt $ $Date: 2004-09-08 16:51:17 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,6 +71,11 @@ TARGET=so_neon
# --- Files --------------------------------------------------------
+.IF "$(SYSTEM_NEON)" == "YES"
+@all:
+ @echo "Using system neon...."
+.ENDIF
+
NEON_NAME=neon-0.23.5
TARFILE_NAME=$(NEON_NAME)