try to make nom installable

This is... wrong. It installs rakudo's pbcs into the general parrot install location, because I can't figure out where the pbcs are actually loaded, and how. On the plus side it gives us an idea what files need to be installed. It gets us so far that we can actually run the perl6 binary from outside the installation path, but using an Int literal results in "Could not locate compile-time value for symbol Int"
rakudo · Jul 25, 2011 · 6a45ccb · 6a45ccb
1 parent d973a42
commit 6a45ccb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Perl6/ModuleLoader.pm b/src/Perl6/ModuleLoader.pm
@@ -24,6 +24,7 @@ class Perl6::ModuleLoader {
             my $prefix := %*COMPILING<%?OPTIONS><module-path>;
             if $prefix {
                 pir::push(@prefixes, $prefix);
+                pir::push(@prefixes, "$prefix/blib");
             } else {
                 pir::push(@prefixes, '.');
                 pir::push(@prefixes, 'blib');

diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
@@ -47,6 +47,7 @@ DYNEXT_DIR     = dynext
 PMC_DIR        = src/pmc
 OPS_DIR        = src/ops
 PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6
+LIBDIR	       = $(PARROT_LIB_DIR)/library
 MANDIR         = @mandir@
 DOCDIR         = @prefix@/share/doc
 
@@ -240,6 +241,17 @@ install: all
 	$(CP)     perl6.pbc           $(DESTDIR)$(PERL6_LANG_DIR)
 	$(CP)     Test.pm             $(DESTDIR)$(PERL6_LANG_DIR)/lib
 	$(CP)     Test.pir            $(DESTDIR)$(PERL6_LANG_DIR)/lib
+	$(MKPATH)                     $(DESTDIR)$(LIBDIR)/Perl6/
+	$(MKPATH)                     $(DESTDIR)$(LIBDIR)/blib/Perl6/
+	$(CP)    $(PERL6_G_PBC)       $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_A_PBC)       $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_M_PBC)       $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_C_PBC)       $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_ML_PBC)      $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_SC_PBC)      $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(PERL6_ST_PBC)      $(DESTDIR)$(LIBDIR)/Perl6/
+	$(CP)    $(SETTING)           $(DESTDIR)$(LIBDIR)
+	$(CP)    $(PERL6_ML_PBC)      $(DESTDIR)$(LIBDIR)/blib/Perl6/
 
 	$(MKPATH)                     $(DESTDIR)$(PARROT_LIB_DIR)/dynext
 	$(CP)     $(DYNPMC) $(DYNOPS) $(DESTDIR)$(PARROT_LIB_DIR)/dynext