Fix prepare_ssl.py script

zware · zware · commit a59f9639fa21 · 2015-04-09T15:48:32.000-05:00
Builds using prepared sources that had Perl available anyway were broken
by the previous fix to this script (oops).
diff --git 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):
