Merge branch 'master' of github.com:perl6/nqp

Conflicts: tools/build/Makefile-JVM.in
Raku · Jun 21, 2013 · f9e0a2b · f9e0a2b
2 parents 5b134ce + 4875091
commit f9e0a2b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -125,6 +125,8 @@ P5QREGEX_SOURCES = \
   src/QRegex/P5Regex/Actions.nqp \
   src/QRegex/P5Regex/Compiler.nqp \
 
+EVAL_CLIENT = tools/jvm/eval-client.pl
+
 NQP_CLASS    = nqp.class
 NQP_JAR      = nqp.jar
 NQP_COMBINED = gen/NQP.nqp
@@ -173,6 +175,7 @@ install: all
 	$(CP) $(P6QREGEX_JAR) $(PREFIX)
 	$(CP) $(NQP_JAR) $(PREFIX)
 	$(CP) $(P5QREGEX_JAR) $(PREFIX)
+	$(CP) $(EVAL_CLIENT) $(PREFIX)
 	$(PERL) tools/build/install-jvm-runner.pl $(PREFIX)
 
 $(RUNTIME_JAR): $(RUNTIME_JAVAS)