[Bps-public-commit] Shipwright branch, master, updated. d95437ad9d817e0feee7fd4838514a8758fb0fd6

sunnavy at bestpractical.com sunnavy at bestpractical.com
Mon Mar 15 00:37:55 EDT 2010


The branch, master has been updated
       via  d95437ad9d817e0feee7fd4838514a8758fb0fd6 (commit)
      from  6540bc410d1dae6883e116e42116d4e4074a4242 (commit)

Summary of changes:
 lib/Shipwright.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit d95437ad9d817e0feee7fd4838514a8758fb0fd6
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Mar 15 12:37:48 2010 +0800

    make strawberry perl happy

diff --git a/lib/Shipwright.pm b/lib/Shipwright.pm
index 6898497..9a6f21e 100644
--- a/lib/Shipwright.pm
+++ b/lib/Shipwright.pm
@@ -12,7 +12,8 @@ use Shipwright::Logger;
 use Shipwright::Util;
 use File::Spec::Functions qw/catfile tmpdir/;
 
-$ENV{SHIPWRIGHT_MAKE} ||= 'make';
+# strawberry perl's build make is 'dmake'
+$ENV{SHIPWRIGHT_MAKE} ||= $^O !~ /MSWin/ ? 'dmake' : 'make';
 $ENV{SHIPWRIGHT_SVK} ||= 'svk';
 $ENV{SHIPWRIGHT_SVN} ||= 'svn';
 $ENV{SHIPWRIGHT_GIT} ||= 'git';

-----------------------------------------------------------------------



More information about the Bps-public-commit mailing list