summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.py8
-rw-r--r--PCbuild/readme.txt2
2 files changed, 5 insertions, 5 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index 7f3a5d0..2693c41 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available.
def find_working_perl(perls):
for perl in perls:
- fh = os.popen(perl + ' -e "use Win32;"')
+ fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read()
rc = fh.close()
if rc:
@@ -186,10 +186,10 @@ def main():
# as "well known" locations
perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
perl = find_working_perl(perls)
- if perl is None:
+ if perl:
+ print("Found a working perl at '%s'" % (perl,))
+ else:
print("No Perl installation was found. Existing Makefiles are used.")
-
- print("Found a working perl at '%s'" % (perl,))
sys.stdout.flush()
# Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
ssl_dir = find_best_ssl_dir(("..\\..",))
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 2a944c6..f4da945 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -156,7 +156,7 @@ _ssl
nasmw.exe.
You can also install ActivePerl from
- http://www.activestate.com/Products/ActivePerl/
+ http://www.activestate.com/activeperl/
if you like to use the official sources instead of the files from
python's subversion repository. The svn version contains pre-build
makefiles and assembly files.