[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  db73bd220816feb6c9d1531d0ac76e09fd4c4a4a (commit)
      from  cde052f59c903af0097ec06c873ab9a6eda05f2b (commit)


- Log -----------------------------------------------------------------
commit db73bd220816feb6c9d1531d0ac76e09fd4c4a4a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 4 00:40:41 2016 +0100

    Make the mk1mf 'mv' command variable
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 util/mk1mf.pl      | 4 +++-
 util/pl/BC-32.pl   | 1 +
 util/pl/VC-32.pl   | 1 +
 util/pl/netware.pl | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index f9eeea8..1f9bdf4 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -182,6 +182,7 @@ $tmp_def="tmp";
 
 $perl="perl" unless defined $perl;
 $mkdir="-mkdir" unless defined $mkdir;
+$mv="mv" unless defined $mv;
 
 ($ssl,$crypto)=("ssl","crypto");
 $ranlib="echo ranlib";
@@ -661,6 +662,7 @@ PERLASM_SCHEME=$mf_perlasm_scheme
 CP=$cp
 CP2=$cp2
 RM=$rm
+MV=$mv
 RANLIB=$ranlib
 MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
@@ -1352,7 +1354,7 @@ sub do_dofile_rule
 	return <<"EOF";
 $to${o}$file: $tmpl
 	\$(PERL) "-I." "-Mconfigdata" util/dofile.pl "$tmpl" > "$to${o}$file.new"
-	mv "$to${o}$file.new" "$to${o}$file"
+	\$(MV) "$to${o}$file.new" "$to${o}$file"
 EOF
 	}
 
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 36ad682..f0f8c9e 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -8,6 +8,7 @@ $crypto="libeay32";
 $o='\\';
 $cp='copy';
 $rm='del';
+$mv='move /Y";
 
 # C compiler stuff
 $cc='bcc32';
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 73160e9..36e52dd 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -26,6 +26,7 @@ $cp='$(PERL) util/copy.pl';
 $cp2='$(PERL) util/copy.pl -stripcr';
 $mkdir='$(PERL) util/mkdir-p.pl';
 $rm='del /Q';
+$mv='move /Y";
 
 $zlib_lib="zlib1.lib";
 
diff --git a/util/pl/netware.pl b/util/pl/netware.pl
index 4e6f876..145911c 100644
--- a/util/pl/netware.pl
+++ b/util/pl/netware.pl
@@ -126,6 +126,8 @@ else
    $cp='copy >nul:';
    # rm command
    $rm='del /f /q';
+   # mv command
+   $mv='move /y';
 }
 
 # assembler