aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Mynott <steve.mynott@gmail.com>2016-04-25 07:40:54 -0700
committerSteve Mynott <steve.mynott@gmail.com>2016-04-25 07:40:54 -0700
commit0e7dbb2e99bcb9292aadcae89d57f88a6370c64e (patch)
tree47c41464e8fde8764715375bb6e9becf5934817e
parentc9e9516a8d483bd0eca4655f9899754e9f224ea7 (diff)
no unix type PATH under windows
-rw-r--r--Configure.pl1
-rw-r--r--tools/build/Makefile.in8
2 files changed, 5 insertions, 4 deletions
diff --git a/Configure.pl b/Configure.pl
index d7b9490..4fc8eb2 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -160,6 +160,7 @@ MAIN: {
$config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':';
$config{'shell'} = $^O eq 'MSWin32' ? 'cmd' : 'sh';
$config{'bat'} = $^O eq 'MSWin32' ? '.bat' : '';
+ $config{'path'} = $^O ne 'MSWin32' ? 'PATH=$(STAR_BIN_DIR):$(PATH)' : '';
my $make = $config{'make'} = $^O eq 'MSWin32' ? 'nmake' : 'make';
my @prefixes = sort map substr($_, 0, 1), keys %backends;
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index e3a9360..9b88cc6 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -56,13 +56,13 @@ modules-install: @backend_modules_install@
modules-install-j: rakudo-install
@echo "== Installing modules for JVM"
- cd modules/panda && PATH=$(STAR_BIN_DIR):$(PATH) $(DESTDIR)$(PERL6_J_INSTALL) bootstrap.pl
- PATH=$(STAR_BIN_DIR):$(PATH) $(PERL) tools/build/module-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)
+ cd modules/panda && @path@ $(DESTDIR)$(PERL6_J_INSTALL) bootstrap.pl
+ @path@ $(PERL) tools/build/module-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)
modules-install-m: rakudo-install
@echo "== Installing modules for MoarVM"
- cd modules/panda && PATH=$(STAR_BIN_DIR):$(PATH) $(DESTDIR)$(PERL6_M_INSTALL) bootstrap.pl
- PATH=$(STAR_BIN_DIR):$(PATH) $(PERL) tools/build/module-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)
+ cd modules/panda && @path@ $(DESTDIR)$(PERL6_M_INSTALL) bootstrap.pl
+ @path@ $(PERL) tools/build/module-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(SITE_BIN_DIR)/panda-m $(MODULES)
modules-test: @backend_modules_test@
verbose-modules-test: @backend_modules_test@