Skip to content

Commit 8564111

Browse files
committed
Install dir layout: replace "languages" with "share"
on MoarVM only, atm
1 parent caa6a98 commit 8564111

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/vm/moar/HLL/Backend.nqp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class HLL::Backend::MoarVM {
137137
# Insert it into a template and write it.
138138
my $template := try slurp('src/vm/moar/profiler/template.html');
139139
unless $template {
140-
$template := slurp(nqp::backendconfig()<prefix> ~ '/languages/nqp/lib/profiler/template.html');
140+
$template := slurp(nqp::backendconfig()<prefix> ~ '/share/nqp/lib/profiler/template.html');
141141
}
142142
my $results := subst($template, /'{{{PROFIELR_OUTPUT}}}'/, $json);
143143
if nqp::defined($filename) {

tools/build/Makefile-common.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ RM_RF = $(PERL) -MExtUtils::Command -e rm_rf
9999

100100
PREFIX = @prefix@
101101
BIN_DIR = $(PREFIX)/bin
102-
NQP_LANG_DIR = $(PREFIX)/languages/nqp
102+
NQP_LANG_DIR = $(PREFIX)/share/nqp
103103
NQP_LIB_DIR = $(NQP_LANG_DIR)/lib
104104
PROVE = prove
105105

tools/build/install-moar-runner.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
$prefix = File::Spec->rel2abs($prefix);
1414
}
1515

16-
my $lib_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib');
17-
my $nqp_mvm = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib', 'nqp.moarvm');
16+
my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib');
17+
my $nqp_mvm = File::Spec->catfile($prefix, 'share', 'nqp', 'lib', 'nqp.moarvm');
1818

1919
if ($^O eq 'MSWin32') {
2020
my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m.bat');

0 commit comments

Comments
 (0)