Fix rpath-related Linux "test_shlibload" failure.

[openssl.git] / util / dofile.pl

diff --git a/util/dofile.pl b/util/dofile.pl
index 955224df7d46f2d0619bb13ece13be22c930d9e2..c3bc9ba9d6045faa3dc53d8baaa4be7cb5ce919b 100644 (file)
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -40,7 +40,7 @@ package OpenSSL::Template;
 use File::Basename;
 use File::Spec::Functions;
 use lib "$FindBin::Bin/perl";
-use with_fallback qw(Text::Template);
+use with_fallback "Text::Template 1.46";
 
 #use parent qw/Text::Template/;
 use vars qw/@ISA/;
@@ -99,9 +99,9 @@ package main;
 # This adds quotes (") around the given string, and escapes any $, @, \,
 # " and ' by prepending a \ to them.
 sub quotify1 {
-    my $s = my $orig = shift @_;
+    my $s = shift @_;
     $s =~ s/([\$\@\\"'])/\\$1/g;
-    $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
+    '"'.$s.'"';
 }
 
 # quotify_l LIST