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

MoarVM only so far
rakudo · Mar 16, 2015 · 7920c16 · 7920c16
1 parent 97215d0
commit 7920c16
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/docs/S11-Modules-proposal.pod b/docs/S11-Modules-proposal.pod
@@ -63,7 +63,7 @@ to use your modules, don't use Unicode in your module names.
 Rakudo effectively gives the following output to -e'.say for @*INC'
 
     ~/.perl6/lib
-    parrot_install/lib/2.1.0-devel/languages/perl6/lib
+    parrot_install/lib/2.1.0-devel/share/perl6/lib
     .
 
 The . entry may be removed from the default @*INC because it creates a

diff --git a/src/core/Inc.pm b/src/core/Inc.pm
@@ -94,7 +94,7 @@
         }
 #?endif
 
-        my $prefix  := $*VM.prefix ~ '/languages/perl6';
+        my $prefix  := $*VM.prefix ~ '/share/perl6';
         my $abspath := "$prefix/share/libraries.json";
         if IO::Path.new-from-absolute-path($abspath).e {
             my $config = from-json( slurp $abspath );

diff --git a/src/vm/moar/ModuleLoaderVMConfig.nqp b/src/vm/moar/ModuleLoaderVMConfig.nqp
@@ -1,9 +1,9 @@
 role Perl6::ModuleLoaderVMConfig {
     method vm_search_paths() {
         my @search_paths;
-        @search_paths.push(nqp::backendconfig<prefix> ~ '/languages/perl6/lib');
+        @search_paths.push(nqp::backendconfig<prefix> ~ '/share/perl6/lib');
         # XXX CHEAT: Goes away when we implement :from<nqp>.
-        @search_paths.push(nqp::backendconfig<prefix> ~ '/languages/nqp/lib');
+        @search_paths.push(nqp::backendconfig<prefix> ~ '/share/nqp/lib');
         @search_paths
     }
 

diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
@@ -7,7 +7,7 @@ M_GEN_CAT = tools/build/gen-cat.nqp moar
 
 MOAR   = $(PREFIX)@slash@bin@slash@moar@exe@
 M_NQP  = $(PREFIX)@slash@bin@slash@nqp-m@runner_suffix@
-M_LIBPATH = $(PREFIX)@slash@languages@slash@nqp@slash@lib
+M_LIBPATH = $(PREFIX)@slash@share@slash@nqp@slash@lib
 
 M_RUN_PERL6 = $(MOAR) --libpath="$(M_LIBPATH)" perl6.moarvm
 

diff --git a/tools/build/Makefile-common.in b/tools/build/Makefile-common.in
@@ -9,7 +9,7 @@ RM_F    = $(PERL) -MExtUtils::Command -e rm_f
 RM_RF   = $(PERL) -MExtUtils::Command -e rm_rf
 
 PREFIX = @prefix@
-PERL6_LANG_DIR = $(PREFIX)/languages/perl6
+PERL6_LANG_DIR = $(PREFIX)/share/perl6
 
 BOOTSTRAP_SOURCES = \
   src/Perl6/Metamodel/BOOTSTRAP.nqp \