openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File usenqplibdir.diff of Package nqp

--- ./tools/build/Makefile-Moar.in.orig	2014-03-03 17:33:25.805102951 +0000
+++ ./tools/build/Makefile-Moar.in	2014-03-03 17:34:27.323102842 +0000
@@ -69,7 +69,7 @@ m-install: m-all
 	$(CP) $(P6QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
 	$(CP) $(NQP_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
 	$(CP) $(P5QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
-	$(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX)
+	$(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX) $(NQP_LIB_DIR)
 
 # FIXME:
 M_CLEANUPS = *.moarvm  gen/moar/* $(M_RUNNER)
--- ./tools/build/install-moar-runner.pl.orig	2014-03-03 17:29:15.805103394 +0000
+++ ./tools/build/install-moar-runner.pl	2014-03-03 17:33:13.787102972 +0000
@@ -6,15 +6,14 @@ use warnings;
 use 5.008;
 use File::Spec;
 
-my ($destdir, $prefix) = @ARGV;
+my ($destdir, $prefix, $lib_dir) = @ARGV;
 my $realpath = $destdir.$prefix;
 
 unless (File::Spec->file_name_is_absolute($prefix)) {
     $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 $nqp_mvm = File::Spec->catfile($lib_dir, 'nqp.moarvm');
 
 if ($^O eq 'MSWin32') {
     my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m.bat');

Places

File usenqplibdir.diff of Package nqp

Places