cppuhelper/source/shlib.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 43c47af0181ada27b558a30b02c51dc665169b99
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Sep 30 22:09:42 2013 +0200
Special-case Mac OS X .jnilib
Change-Id: I824e83271997888712f126f4197252d7beefccc1
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index fc8b6a8..0933ddb 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -227,7 +227,11 @@ static OUString makeComponentPath(
if (rPath[ rPath.getLength() -1 ] != '/')
buf.append( (sal_Unicode) '/' );
}
- if (! rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION ))
+ if (!rLibName.endsWithIgnoreAsciiCase( SAL_DLLEXTENSION )
+#if defined MACOSX
+ && !rLibName.endsWithIgnoreAsciiCase(".jnilib")
+#endif
+ )
{
#if defined SAL_DLLPREFIX
if (! rLibName.endsWithIgnoreAsciiCase( ".uno" ))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
