diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2024-06-12 18:24:40 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2024-06-12 21:24:43 +0200 |
| commit | fb3906c1fc78e99756dd025578d7fc96fe36b39b (patch) | |
| tree | 58c4f52151692494775176d62cb47b00ef744b70 | |
| parent | Update copyright header and other minor text updates (diff) | |
| download | java-config-fb3906c1fc78e99756dd025578d7fc96fe36b39b.tar.gz java-config-fb3906c1fc78e99756dd025578d7fc96fe36b39b.tar.bz2 java-config-fb3906c1fc78e99756dd025578d7fc96fe36b39b.zip | |
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 <flow@gentoo.org>
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/meson.build | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -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', |