From fb3906c1fc78e99756dd025578d7fc96fe36b39b Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 12 Jun 2024 18:24:40 +0200 Subject: Fix launcher location in Gentoo-prefix installations The launcher was installed in $EPREFIX/share/java-config-2/launcher, when it should be $EPREFIX/usr/share/java-config-2/launcher. Bug: https://bugs.gentoo.org/933521 Signed-off-by: Florian Schmaus --- NEWS | 1 + src/meson.build | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2faa9d9..1fa9a89 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ For full ChangeLog generated from svn commit logs see ChangeLog. 2.3.4: * Install java-config-2 as java-config from now on +* Fix launcher installation in Gentoo-prefix installations (#933521) 2.3.3 / 2.3.2: * Correctly set java.library.path in launcher diff --git a/src/meson.build b/src/meson.build index c80b814..bdfaa31 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,9 +20,11 @@ if python_only subdir_done() endif +prefix = get_option('prefix') + launcherdir_rel = 'share' / 'java-config-2' / 'launcher' -launcherdir = system_wide ? eprefix / launcherdir_rel \ - : datadir / eprefix / launcherdir_rel +launcherdir = system_wide ? prefix / launcherdir_rel \ + : datadir / prefix / launcherdir_rel launcher_bash = configure_file( input: 'launcher.bash', -- cgit v1.2.3-65-gdbad