Permalink
Browse files

[JVM] use "install" prefix, and nqp-j

  • Loading branch information...
1 parent 54ffc91 commit 5df14829f255c3a3c1c03f5243e45bcdf87043e1 @moritz moritz committed Oct 21, 2013
Showing with 4 additions and 6 deletions.
  1. +4 −6 ConfigureJVM.pl
View
@@ -38,11 +38,9 @@
print_help();
exit(0);
}
-
- my $prefix = $options{'prefix'} ||
- ($^O eq 'MSWin32' ? cwd().'\\install-jvm' : cwd().'/install-jvm');
- my $with_nqp = $options{'with-nqp'} ||
- ($^O eq 'MSWin32' ? 'install-jvm\\bin\\nqp' : 'install-jvm/bin/nqp');
+ my $slash = $^O eq 'MSWin32' ? '\\' : '/';
+ my $prefix = $options{'prefix'} || cwd() . "${slash}install";
+ my $with_nqp = $options{'with-nqp'} || "$prefix${slash}bin${slash}nqp-j";
my $gen_nqp = $options{'gen-nqp'};
$prefix = realpath($prefix);
@@ -94,7 +92,7 @@
$config{'makefile-timing'} = $options{'makefile-timing'};
$config{'stagestats'} = '--stagestats' if $options{'makefile-timing'};
$config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':';
- $config{'slash'} = $^O eq 'MSWin32' ? '\\' : '/';
+ $config{'slash'} = $slash;
$config{'runner'} = $^O eq 'MSWin32' ? 'perl6.bat' : 'perl6';
my $make = $config{'make'} = $^O eq 'MSWin32' ? 'nmake' : 'make';

0 comments on commit 5df1482

Please sign in to comment.