From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 14 Apr 2010 23:07:12 +0000 (+0000)
Subject: PR: 2234
X-Git-Tag: OpenSSL-fips-2_0-rc1~1124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=45078e6c52cb183bc21dd31b0003744b1eae963a;p=oweals%2Fopenssl.git

PR: 2234
Submitted By: Matthias Andree <matthias.andree@gmx.de>

Use correct path to openssl utility in c_rehash script.
---

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 6dd3c24fc1..bfc4a69ed4 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -7,6 +7,7 @@
 my $openssl;
 
 my $dir;
+my $prefix;
 
 if(defined $ENV{OPENSSL}) {
 	$openssl = $ENV{OPENSSL};
@@ -24,7 +25,7 @@ if (defined(&Cwd::getcwd)) {
 }
 my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; # DOS/Win32 or Unix delimiter?
 
-$ENV{PATH} .= "$path_delim$dir/bin";
+$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); # prefix our path
 
 if(! -x $openssl) {
 	my $found = 0;