From 7c021b3126a3aab9514de359a2a07f2a4217e0d6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 13 Oct 2010 13:29:21 +0100
Subject: tweaks for AIX

---
 jvmfwk/distributions/OpenOfficeorg/makefile.mk | 2 +-
 jvmfwk/source/fwkutil.cxx                      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
index a6ba7a23725a..36e8e8d6cbf5 100755
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
@@ -43,7 +43,7 @@ $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_mac
     -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
 .ELIF "$(OS)"=="MACOSX"
     -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX"
+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX"
     -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
 .ELSE
     -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index a2c56310b550..452ce5faccec 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -270,8 +270,10 @@ rtl::OUString findPlugin(
         {
             rtl::OUString url;
 #ifdef UNX
-#ifdef MACOSX
+#if defined(MACOSX)
             rtl::OUString path = rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH");
+#elif defined(AIX)
+            rtl::OUString path = rtl::OUString::createFromAscii("LIBPATH");
 #else
             rtl::OUString path = rtl::OUString::createFromAscii("LD_LIBRARY_PATH");
 #endif
-- 
cgit