Fix prepare_ssl.py script
Builds using prepared sources that had Perl available anyway were broken by the previous fix to this script (oops).
This commit is contained in:
parent
7cc28b6238
commit
a59f9639fa
|
@ -115,6 +115,7 @@ def fix_makefile(makefile):
|
||||||
"""
|
"""
|
||||||
if not os.path.isfile(makefile):
|
if not os.path.isfile(makefile):
|
||||||
return
|
return
|
||||||
|
copy_if_different = r'$(PERL) $(SRC_D)\util\copy-if-different.pl'
|
||||||
with open(makefile) as fin:
|
with open(makefile) as fin:
|
||||||
lines = fin.readlines()
|
lines = fin.readlines()
|
||||||
with open(makefile, 'w') as fout:
|
with open(makefile, 'w') as fout:
|
||||||
|
@ -132,9 +133,8 @@ def fix_makefile(makefile):
|
||||||
if noalgo not in line:
|
if noalgo not in line:
|
||||||
line = line + noalgo
|
line = line + noalgo
|
||||||
line = line + '\n'
|
line = line + '\n'
|
||||||
if r'$(SRC_D)\util\copy-if-different.pl' in line:
|
if copy_if_different in line:
|
||||||
line = line.replace(r'$(SRC_D)\util\copy-if-different.pl',
|
line = line.replace(copy_if_different, 'copy /Y')
|
||||||
'copy /Y')
|
|
||||||
fout.write(line)
|
fout.write(line)
|
||||||
|
|
||||||
def run_configure(configure, do_script):
|
def run_configure(configure, do_script):
|
||||||
|
|
Loading…
Reference in New Issue