diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2018-06-25 23:42:44 +0200 |
|---|---|---|
| committer | Thomas Klausner <tk@giga.or.at> | 2018-06-25 23:45:41 +0200 |
| commit | 8db53bfd74e48f60e3002b2ae5f7f13c9387725a (patch) | |
| tree | ed20a132c22c8d0faa54b69b0badbecbccbe7957 /svx/source/gengal | |
| parent | a777e447a7d78cd91aca09b373f36c057e8bd8e0 (diff) | |
Fix "javaPathHelper: not found" errors during startup.
javaPathHelper is a tool from OpenBSD ports, so there is no point
looking for it on other operating systems.
Change-Id: I763d717fdf7172b412d527fcd88347b2e54a8fe9
Diffstat (limited to 'svx/source/gengal')
| -rwxr-xr-x | svx/source/gengal/gengal.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh index b4d10458650a..3970ab1fa9c8 100755 --- a/svx/source/gengal/gengal.sh +++ b/svx/source/gengal/gengal.sh @@ -35,7 +35,7 @@ cd "$sd_cwd" # this is a temporary hack until we can live with the default search paths case "$(uname -s)" in -NetBSD|OpenBSD|FreeBSD|DragonFly) +OpenBSD) LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null) export LD_LIBRARY_PATH @@ -43,6 +43,10 @@ NetBSD|OpenBSD|FreeBSD|DragonFly) export JAVA_HOME fi ;; +NetBSD|FreeBSD|DragonFly) + LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + export LD_LIBRARY_PATH + ;; AIX) LIBPATH=$sd_prog${LIBPATH:+:${LIBPATH}} export LIBPATH |