summaryrefslogtreecommitdiff
path: root/odk/source/com
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-08-12 12:21:35 +0000
committerOliver Bolte <obo@openoffice.org>2004-08-12 12:21:35 +0000
commitc302c5428d50ccc3e95416fb6e434dcd7daec016 (patch)
treeabb0b194a492992b49fa3fd12be2e72a482ad54a /odk/source/com
parent907d5604fd7cca1e43f3955ad346c71554b35e54 (diff)
INTEGRATION: CWS tbe12 (1.2.18); FILE MERGED
2004/07/30 15:52:17 tbe 1.2.18.1: #i32314# disable java bug ...
Diffstat (limited to 'odk/source/com')
-rw-r--r--odk/source/com/sun/star/lib/loader/makefile.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/odk/source/com/sun/star/lib/loader/makefile.mk b/odk/source/com/sun/star/lib/loader/makefile.mk
index c3d03776fb3c..a9c579bc0b77 100644
--- a/odk/source/com/sun/star/lib/loader/makefile.mk
+++ b/odk/source/com/sun/star/lib/loader/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: obo $ $Date: 2004-05-28 15:51:49 $
+# last change: $Author: obo $ $Date: 2004-08-12 13:21:35 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,6 +71,11 @@ TARGET = com_sun_star_lib_loader
.INCLUDE : settings.mk
+.IF "$(SOLAR_JAVA)"==""
+nojava:
+ @echo "Not building javaunohelper because Java is disabled"
+.ENDIF
+
# Files --------------------------------------------------------
JAVAFILES= \