Adjust install dirs on the JVM

Raku · Mar 16, 2015 · 216b72e · 216b72e
1 parent 8564111
commit 216b72e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tools/build/gen-jvm-properties.pl b/tools/build/gen-jvm-properties.pl
@@ -16,8 +16,8 @@
 my $libdir = ".";
 
 if ($prefix ne '.') {
-    $jardir = "${prefix}/languages/nqp/runtime";
-    $libdir = "${prefix}/languages/nqp/lib";
+    $jardir = "${prefix}/share/nqp/runtime";
+    $libdir = "${prefix}/share/nqp/lib";
 	my @jars = grep { s/^.*\/// } split($cpsep, $thirdPartyJars);
 	$thirdPartyJars = join($cpsep, grep { s/^/${jardir}\// } @jars);
 }

diff --git a/tools/build/install-jvm-runner.pl b/tools/build/install-jvm-runner.pl
@@ -13,8 +13,8 @@
     $prefix = File::Spec->rel2abs($prefix);
 }
 
-my $jar_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'runtime');
-my $lib_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib');
+my $jar_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'runtime');
+my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib');
 
 if ($^O eq 'MSWin32') {
     my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j.bat');