Tweak install layout for the JVM

rakudo · Mar 16, 2015 · 1c58dd2 · 1c58dd2
1 parent 7920c16
commit 1c58dd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -8,7 +8,7 @@ NQP_PREFIX = @nqp_prefix@
 
 J_BUILD_DIR = gen/jvm
 
-PERL6_LANG_DIR = $(PREFIX)/languages/perl6
+PERL6_LANG_DIR = $(PREFIX)/share/perl6
 
 NQP_JARS = @nqp_jars@
 

diff --git a/tools/build/create-jvm-runner.pl b/tools/build/create-jvm-runner.pl
@@ -28,9 +28,9 @@
 my $postamble = $^O eq 'MSWin32' ? ' %*' : ' "$@"';
 
 my $bindir = $type eq 'install' ? File::Spec->catfile($prefix, 'bin') : $prefix;
-my $jardir = $type eq 'install' ? File::Spec->catfile($prefix, 'languages', 'perl6', 'runtime') : $prefix;
-my $libdir = $type eq 'install' ? File::Spec->catfile($prefix, 'languages', 'perl6', 'lib') : 'blib';
-my $nqplibdir = File::Spec->catfile($nqpprefix, 'languages', 'nqp', 'lib');
+my $jardir = $type eq 'install' ? File::Spec->catfile($prefix, 'share', 'perl6', 'runtime') : $prefix;
+my $libdir = $type eq 'install' ? File::Spec->catfile($prefix, 'share', 'perl6', 'lib') : 'blib';
+my $nqplibdir = File::Spec->catfile($nqpprefix, 'share', 'nqp', 'lib');
 
 sub install {
     my ($name, $command) = @_;