Merge branch 'nom' of github.com:rakudo/rakudo into wip-openpipe

rakudo · Feb 7, 2014 · cdb7dfa · cdb7dfa
2 parents d62a7b2 + e4e8625
commit cdb7dfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/architecture.html b/docs/architecture.html
@@ -25,7 +25,7 @@ <h2 id="parser" >Parser and Action Methods</h2>
 
 <h2 id="the-world">The World</h2>
 
-<p>The World is where the parser and the action methods store any declarations they encouter during their runs, including Classes, Types, Signatures, Constants, Subs and Methods.</p>
+<p>The World is where the parser and the action methods store any declarations they encounter during their runs, including Classes, Types, Signatures, Constants, Subs and Methods.</p>
 
 
 <h2 id="qast-compiler">QAST compiler</h2>

diff --git a/tools/build/create-jvm-runner.pl b/tools/build/create-jvm-runner.pl
@@ -29,7 +29,9 @@
 sub install {
     my ($name, $command) = @_;
 
-    my $install_to = File::Spec->catfile($destdir, $bindir, "$name$bat");
+    my $install_to = $destdir
+        ? File::Spec->catfile($destdir, $bindir, "$name$bat")
+        : File::Spec->catfile($bindir, "$name$bat");
 
     print "Creating '$install_to'\n";
     open my $fh, ">", $install_to or die "open: $!";