diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 16:13:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 16:16:57 +0200 |
| commit | 4e8491a7e793a6b60a3ffdda8447f2c7000eed10 (patch) | |
| tree | 2a04d9386c344aebae63905730a3f40ab4dfd4a7 | |
| parent | 6f0ddddff1b5e986a6b4879023600182fd32e82d (diff) | |
Get Mac OS X libjava_uno.jnilib -> libjava_uno.dylib symlink into instdir
...not exactly a nice way to do it, though. Plus, further missing instdir
.jnilibs are LibreOffice.app/Contents/MacOS/libhsqldb.jnilib -> libhsqldb.dylib
and LibreOffice.app/Contents/ure-link/lib/libjpipe.jnilib (which should not be
a symlink but should replace the corresponding libjpipe.dylib completely).
Change-Id: I5505704fc52da42e40c8b27185450d3fec8a864d
| -rw-r--r-- | bridges/Module_bridges.mk | 1 | ||||
| -rw-r--r-- | bridges/Package_jnilib_java_uno.mk | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index e5600a63cb82..6c4e3bf6bd3a 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ $(if $(ENABLE_JAVA),\ Jar_java_uno \ Library_java_uno \ + $(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \ ) \ $(if $(filter R,$(CPU)),\ $(if $(filter IOS,$(OS)),\ diff --git a/bridges/Package_jnilib_java_uno.mk b/bridges/Package_jnilib_java_uno.mk new file mode 100644 index 000000000000..7dfe7744e8c6 --- /dev/null +++ b/bridges/Package_jnilib_java_uno.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,bridges_jnilib_java_uno,$(SRCDIR))) + +$(eval $(call gb_Package_set_outdir,bridges_jnilib_java_uno,$(gb_INSTROOT))) + +$(eval $(call gb_Package_add_symbolic_link,bridges_jnilib_java_uno,$(LIBO_URE_LIB_FOLDER)/$(basename $(notdir $(call gb_Library_get_target,java_uno))).jnilib,$(notdir $(call gb_Library_get_target,java_uno)))) + +# vim: set noet sw=4 ts=4: |