summaryrefslogtreecommitdiff
path: root/odk/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-08-12 12:21:47 +0000
committerOliver Bolte <obo@openoffice.org>2004-08-12 12:21:47 +0000
commite1856410f8deb46bbd1dd7e175b5148b45b2eaee (patch)
tree2900a569eaf64029e52d4937f6cee32be85977ee /odk/source
parentc302c5428d50ccc3e95416fb6e434dcd7daec016 (diff)
INTEGRATION: CWS tbe12 (1.2.18); FILE MERGED
2004/07/30 15:53:15 tbe 1.2.18.1: #i32314# disable java bug ...
Diffstat (limited to 'odk/source')
-rw-r--r--odk/source/unowinreg/win/makefile.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index b8c346d3a0ed..8bbe55fa431c 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/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:53:03 $
+# last change: $Author: obo $ $Date: 2004-08-12 13:21:47 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,6 +74,11 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
+.IF "$(SOLAR_JAVA)"==""
+nojava:
+ @echo "Not building javaunohelper because Java is disabled"
+.ENDIF
+
# --- Files --------------------------------------------------------
SLOFILES = \