Make the mk1mf 'mv' command variable

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-04 00:40:41 +01:00
parent cde052f59c
commit db73bd2208
4 changed files with 7 additions and 1 deletions

View File

@ -182,6 +182,7 @@ $tmp_def="tmp";
$perl="perl" unless defined $perl; $perl="perl" unless defined $perl;
$mkdir="-mkdir" unless defined $mkdir; $mkdir="-mkdir" unless defined $mkdir;
$mv="mv" unless defined $mv;
($ssl,$crypto)=("ssl","crypto"); ($ssl,$crypto)=("ssl","crypto");
$ranlib="echo ranlib"; $ranlib="echo ranlib";
@ -661,6 +662,7 @@ PERLASM_SCHEME=$mf_perlasm_scheme
CP=$cp CP=$cp
CP2=$cp2 CP2=$cp2
RM=$rm RM=$rm
MV=$mv
RANLIB=$ranlib RANLIB=$ranlib
MKDIR=$mkdir MKDIR=$mkdir
MKLIB=$bin_dir$mklib MKLIB=$bin_dir$mklib
@ -1352,7 +1354,7 @@ sub do_dofile_rule
return <<"EOF"; return <<"EOF";
$to${o}$file: $tmpl $to${o}$file: $tmpl
\$(PERL) "-I." "-Mconfigdata" util/dofile.pl "$tmpl" > "$to${o}$file.new" \$(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 EOF
} }

View File

@ -8,6 +8,7 @@ $crypto="libeay32";
$o='\\'; $o='\\';
$cp='copy'; $cp='copy';
$rm='del'; $rm='del';
$mv='move /Y";
# C compiler stuff # C compiler stuff
$cc='bcc32'; $cc='bcc32';

View File

@ -26,6 +26,7 @@ $cp='$(PERL) util/copy.pl';
$cp2='$(PERL) util/copy.pl -stripcr'; $cp2='$(PERL) util/copy.pl -stripcr';
$mkdir='$(PERL) util/mkdir-p.pl'; $mkdir='$(PERL) util/mkdir-p.pl';
$rm='del /Q'; $rm='del /Q';
$mv='move /Y";
$zlib_lib="zlib1.lib"; $zlib_lib="zlib1.lib";

View File

@ -126,6 +126,8 @@ else
$cp='copy >nul:'; $cp='copy >nul:';
# rm command # rm command
$rm='del /f /q'; $rm='del /f /q';
# mv command
$mv='move /y';
} }
# assembler # assembler