From 13cfe26f4203aedee99b0237228f8346bfb186e8 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 23 Jul 2004 10:49:14 +0000
Subject: INTEGRATION: CWS jl8 (1.2.4); FILE MERGED 2004/06/23 12:27:18 jl
 1.2.4.1: #i30342#

---
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |  6 +++++-
 jvmfwk/distributions/OpenOfficeorg/makefile.mk         | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 56751f4da5ce..4cc4a4f5b1da 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -9,9 +9,13 @@
   <vendor name="Sun Microsystems Inc.">
     <minVersion>1.4.1_01</minVersion>
   </vendor>
+  <vendor name="IBM Corporation">
+    <minVersion>1.4.1</minVersion>
+  </vendor>
  </vendorInfos>
 
  <plugins>
   <library vendor="Sun Microsystems Inc.">program/sunjavaplugin.dll</library>
+  <library vendor="IBM Corporation">program/ibmjavaplugin.dll</library>
  </plugins>
-</javaSelection>
\ No newline at end of file
+</javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
index d062d73fa38b..a1914cb84070 100755
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: jl $ $Date: 2004-05-21 09:03:25 $
+#   last change: $Author: hr $ $Date: 2004-07-23 11:49:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,9 +71,15 @@ nojava:
 .ENDIF
 
 .IF "$(SOLAR_JAVA)"!=""
-$(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml 
+$(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
+    +-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
+.ELIF "$(OS)"=="LINUX"
+    +-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
+.ELSE
     +-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml
+.ENDIF
 .ELIF "$(GUI)"=="WNT"
     +-$(COPY) javavendors_wnt.xml $(BIN)$/javavendors_ooo.xml	
 .ELSE
-- 
cgit v1.2.3