diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-09 20:48:32 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-09 20:48:32 (GMT) |
| commit | a59f9639fa21acd3c960baba1b602be519234497 (patch) | |
| tree | 53478cf8df500729a5a6ec4136d91ee32e2d9d40 | |
| parent | 7cc28b623839fa336eb8b303cbf1b604e75ea70f (diff) | |
| download | cpython-a59f9639fa21acd3c960baba1b602be519234497.zip cpython-a59f9639fa21acd3c960baba1b602be519234497.tar.gz cpython-a59f9639fa21acd3c960baba1b602be519234497.tar.bz2 | |
Fix prepare_ssl.py script
Builds using prepared sources that had Perl available anyway were broken
by the previous fix to this script (oops).
| -rw-r--r-- | PCbuild/prepare_ssl.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py index 16d77d9..6894880 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): |