Install dir layout: replace "languages" with "share"

on MoarVM only, atm
Raku · Mar 16, 2015 · 8564111 · 8564111
1 parent caa6a98
commit 8564111
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/vm/moar/HLL/Backend.nqp b/src/vm/moar/HLL/Backend.nqp
@@ -137,7 +137,7 @@ class HLL::Backend::MoarVM {
         # Insert it into a template and write it.
         my $template := try slurp('src/vm/moar/profiler/template.html');
         unless $template {
-            $template := slurp(nqp::backendconfig()<prefix> ~ '/languages/nqp/lib/profiler/template.html');
+            $template := slurp(nqp::backendconfig()<prefix> ~ '/share/nqp/lib/profiler/template.html');
         }
         my $results  := subst($template, /'{{{PROFIELR_OUTPUT}}}'/, $json);
         if nqp::defined($filename) {

diff --git a/tools/build/Makefile-common.in b/tools/build/Makefile-common.in
@@ -99,7 +99,7 @@ RM_RF         = $(PERL) -MExtUtils::Command -e rm_rf
 
 PREFIX          = @prefix@
 BIN_DIR         = $(PREFIX)/bin
-NQP_LANG_DIR    = $(PREFIX)/languages/nqp
+NQP_LANG_DIR    = $(PREFIX)/share/nqp
 NQP_LIB_DIR     = $(NQP_LANG_DIR)/lib
 PROVE           = prove
 

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