From e1856410f8deb46bbd1dd7e175b5148b45b2eaee Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 12 Aug 2004 12:21:47 +0000
Subject: INTEGRATION: CWS tbe12 (1.2.18); FILE MERGED 2004/07/30 15:53:15 tbe
 1.2.18.1: #i32314# disable java bug ...

---
 odk/source/unowinreg/win/makefile.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'odk/source')

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 = \
-- 
cgit