Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Actually install the default 'nqp'
Now when you run 'make install', you'll install 'nqp' along with 'nqp-m'
and/or 'nqp-j' into the appropriate BIN_DIR.
  • Loading branch information
ShimmerFairy committed Aug 22, 2015
1 parent cb4f525 commit 77ddfb5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Configure.pl
Expand Up @@ -106,7 +106,8 @@

my $launcher = substr($default_backend, 0, 1) . '-runner-default';
print $MAKEFILE "all: ", join(' ', map("$_-all", @prefixes), $launcher), "\n";
for my $t (qw/clean test qregex-test install/) {
print $MAKEFILE "install: ", join(' ', map("$_-install", @prefixes), $launcher . '-install'), "\n";
for my $t (qw/clean test qregex-test/) {
print $MAKEFILE "$t: ", join(' ', map "$_-$t", @prefixes), "\n";
}

Expand Down
4 changes: 4 additions & 0 deletions tools/build/Makefile-JVM.in
Expand Up @@ -255,6 +255,10 @@ j-runner-default: j-all
$(CP) $(J_RUNNER) nqp$(BAT)
$(CHMOD) 755 nqp$(BAT)

j-runner-default-install: j-runner-default j-install
$(CP) $(DESTDIR)$(BIN_DIR)/$(J_RUNNER) $(DESTDIR)$(BIN_DIR)/nqp$(BAT)
$(CHMOD) 755 $(DESTDIR)$(BIN_DIR)/nqp$(BAT)

$(P5QREGEX_JAR): $(ALL_OUTPUT) $(P5QREGEX_SOURCES)
$(MKPATH) $(J_STAGE2)
$(PERL) tools/build/gen-cat.pl jvm $(P5QREGEX_SOURCES) > $(J_STAGE2)/$(P5QREGEX_COMBINED)
Expand Down
4 changes: 4 additions & 0 deletions tools/build/Makefile-Moar.in
Expand Up @@ -260,6 +260,10 @@ m-runner-default: m-all
$(CP) $(M_RUNNER) nqp$(BAT)
$(CHMOD) 755 nqp$(BAT)

m-runner-default-install: m-runner-default m-install
$(CP) $(DESTDIR)$(BIN_DIR)/$(M_RUNNER) $(DESTDIR)$(BIN_DIR)/nqp$(BAT)
$(CHMOD) 755 $(DESTDIR)$(BIN_DIR)/nqp$(BAT)

$(P5QREGEX_MOAR): $(P5QREGEX_SOURCES) $(NQP_MOAR) $(M_RUNNER)
$(MKPATH) $(M_STAGE2)/gen
$(PERL) tools/build/gen-cat.pl moar $(P5QREGEX_SOURCES) > $(M_STAGE2)/$(P5QREGEX_COMBINED)
Expand Down

0 comments on commit 77ddfb5

Please sign in to comment.