diff options
| author | Steve Mynott <steve.mynott@gmail.com> | 2016-04-29 22:22:33 +0100 |
|---|---|---|
| committer | Steve Mynott <steve.mynott@gmail.com> | 2016-04-29 22:22:33 +0100 |
| commit | 87c3a4a4acbf43bfdcba71b049ad2807b8580668 (patch) | |
| tree | 430e9537eacae2d0f7bf845df00af037d25a27d1 | |
| parent | 33799694290c06c62f414d3ffebdd1f7eb792654 (diff) | |
fix PATH for make modules-install under windows
| -rw-r--r-- | Configure.pl | 2 | ||||
| -rw-r--r-- | tools/build/Makefile.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Configure.pl b/Configure.pl index 4fc8eb2..8ac9ee4 100644 --- a/Configure.pl +++ b/Configure.pl @@ -160,7 +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)' : ''; + $config{'path'} = $^O ne 'MSWin32' ? 'sh -c "PATH=$(STAR_BIN_DIR):$(PATH)' : 'cmd /c "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 9b88cc6..0506f49 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@ $(DESTDIR)$(PERL6_J_INSTALL) bootstrap.pl - @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@ $(DESTDIR)$(PERL6_M_INSTALL) bootstrap.pl - @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@ |