Make the mk1mf 'mv' command variable

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index f9eeea8e652df421b2195fa2348cbe05ded83be9..1f9bdf47b74febff1b9d0c10372f1fcf9ff0ec70 100755 (executable)
--- 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 36ad6823be90edd68eb82be65ac4fb80c91c91f9..f0f8c9e8d150e1ebb2b50a63b43f739ee9bb24c0 100644 (file)
--- 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 73160e9ebd9c4dacb3e0325398e977f2b4c6d9fd..36e52dd27a6bc78e42ea5b1c0365092851480f8e 100644 (file)
--- 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 4e6f876378824643076a498ab80924fbe8950a34..145911c9e293bd0efcd46069edbe14d103f84bfd 100644 (file)
--- 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