Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Teach j-install about DESTDIR

  • Loading branch information...
commit a7f7522bde63fb16dab98cdb4a124244de3974d3 1 parent 3cef562
@Benabik Benabik authored moritz committed
Showing with 19 additions and 19 deletions.
  1. +16 −16 tools/build/Makefile-JVM.in
  2. +3 −3 tools/build/create-jvm-runner.pl
View
32 tools/build/Makefile-JVM.in
@@ -281,7 +281,7 @@ $(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
$(RUN_PERL6) --setting=NULL --optimize=3 --target=jar --stagestats --output=$(SETTING_JAR) $(J_BUILD_DIR)/CORE.setting
$(RUNNER):
- $(PERL) tools/build/create-jvm-runner.pl dev . $(NQP_PREFIX) $(NQP_JARS)
+ $(PERL) tools/build/create-jvm-runner.pl dev . . $(NQP_PREFIX) $(NQP_JARS)
j-runner-default: j-all
$(CP) $(RUNNER) perl6$(BAT)
@@ -342,23 +342,23 @@ sometests: j-all
@$(J_HARNESS_WITH_FUDGE) $(TESTFILES)
j-install: j-all tools/build/create-jvm-runner.pl
- $(MKPATH) $(PREFIX)/bin
- $(MKPATH) $(PERL6_LANG_DIR)/lib/Perl6
- $(MKPATH) $(PERL6_LANG_DIR)/runtime
- $(CP) $(PERL6_LANG_JARS) $(PERL6_LANG_DIR)/lib/Perl6
- $(CP) $(SETTING_JAR) $(PERL6_LANG_DIR)/runtime
- $(CP) $(PERL6_JAR) $(PERL6_LANG_DIR)/runtime
- $(CP) $(RUNTIME_JAR) $(PERL6_LANG_DIR)/runtime
- $(CP) blib/Test.jar $(PERL6_LANG_DIR)/lib
- $(CP) blib/lib.jar $(PERL6_LANG_DIR)/lib
- $(MKPATH) $(PERL6_LANG_DIR)/lib/Pod/To
- $(CP) blib/Pod/To/Text.jar $(PERL6_LANG_DIR)/lib/Pod/To
- $(PERL) tools/build/create-jvm-runner.pl install $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+ $(MKPATH) $(DESTDIR)$(PREFIX)/bin
+ $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/lib/Perl6
+ $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
+ $(CP) $(PERL6_LANG_JARS) $(DESTDIR)$(PERL6_LANG_DIR)/lib/Perl6
+ $(CP) $(SETTING_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
+ $(CP) $(PERL6_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
+ $(CP) $(RUNTIME_JAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime
+ $(CP) blib/Test.jar $(DESTDIR)$(PERL6_LANG_DIR)/lib
+ $(CP) blib/lib.jar $(DESTDIR)$(PERL6_LANG_DIR)/lib
+ $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/lib/Pod/To
+ $(CP) blib/Pod/To/Text.jar $(DESTDIR)$(PERL6_LANG_DIR)/lib/Pod/To
+ $(PERL) tools/build/create-jvm-runner.pl install $(DESTDIR) $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
j-runner-default-install: j-all
- $(PERL) tools/build/create-jvm-runner.pl install $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
- $(CP) $(PREFIX)/bin/perl6-j$(BAT) $(PREFIX)/bin/perl6$(BAT)
- $(CHMOD) 755 $(PREFIX)/bin/perl6$(BAT)
+ $(PERL) tools/build/create-jvm-runner.pl install $(DESTDIR) $(PREFIX) $(NQP_PREFIX) $(NQP_JARS)
+ $(CP) $(DESTDIR)$(PREFIX)/bin/perl6-j$(BAT) $(DESTDIR)$(PREFIX)/bin/perl6$(BAT)
+ $(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6$(BAT)
## cleaning
j-clean:
View
6 tools/build/create-jvm-runner.pl
@@ -7,9 +7,9 @@
use File::Spec;
use File::Copy 'cp';
-my $USAGE = "Usage: $0 <type> <prefix> <nqp prefix> <third party jars>\n";
+my $USAGE = "Usage: $0 <type> <destdir> <prefix> <nqp prefix> <third party jars>\n";
-my ($type, $prefix, $nqpprefix, $thirdpartyjars) = @ARGV
+my ($type, $destdir, $prefix, $nqpprefix, $thirdpartyjars) = @ARGV
or die $USAGE;
die "Invalid target type $type" unless $type eq 'dev' || $type eq 'install';
@@ -29,7 +29,7 @@
sub install {
my ($name, $command) = @_;
- my $install_to = File::Spec->catfile($bindir, "$name$bat");
+ my $install_to = File::Spec->catfile($destdir, $bindir, "$name$bat");
print "Creating '$install_to'\n";
open my $fh, ">", $install_to or die "open: $!";
Please sign in to comment.
Something went wrong with that request. Please try again.