From a59f9639fa21acd3c960baba1b602be519234497 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Thu, 9 Apr 2015 15:48:32 -0500 Subject: [PATCH] Fix prepare_ssl.py script Builds using prepared sources that had Perl available anyway were broken by the previous fix to this script (oops). --- PCbuild/prepare_ssl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py index 16d77d9506a..6894880d430 100644 --- a/PCbuild/prepare_ssl.py +++ b/PCbuild/prepare_ssl.py @@ -115,6 +115,7 @@ def fix_makefile(makefile): """ if not os.path.isfile(makefile): return + copy_if_different = r'$(PERL) $(SRC_D)\util\copy-if-different.pl' with open(makefile) as fin: lines = fin.readlines() with open(makefile, 'w') as fout: @@ -132,9 +133,8 @@ def fix_makefile(makefile): if noalgo not in line: line = line + noalgo line = line + '\n' - if r'$(SRC_D)\util\copy-if-different.pl' in line: - line = line.replace(r'$(SRC_D)\util\copy-if-different.pl', - 'copy /Y') + if copy_if_different in line: + line = line.replace(copy_if_different, 'copy /Y') fout.write(line) def run_configure(configure, do_script):