From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 26 Apr 2009 15:51:44 +0000 (+0000)
Subject: Fix to escape backslashes in prefix
X-Git-Tag: OpenSSL_0_9_8m-beta1~234
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=43f392c9a18dafb666bdcd1224a8129cdc3a2f99;p=oweals%2Fopenssl.git

Fix to escape backslashes in prefix
---

diff --git a/Configure b/Configure
index c6dbfae482..0547abdfb9 100755
--- a/Configure
+++ b/Configure
@@ -1643,9 +1643,20 @@ print OUT "#define OPENSSL_CPUID_OBJ\n\n" if ($cpuid_obj);
 while (<IN>)
 	{
 	if	(/^#define\s+OPENSSLDIR/)
-		{ print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
+		{
+		my $foo = $openssldir;
+		$foo =~ s/\\/\\\\/g;
+		print OUT "#define OPENSSLDIR \"$foo\"\n";
+		}
 	elsif	(/^#define\s+ENGINESDIR/)
-		{ print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
+		{
+		# $foo is to become "$prefix/lib$multilib/engines";
+		# as Makefile.org and engines/Makefile are adapted for
+		# $multilib suffix.
+		my $foo = "$prefix/lib/engines";
+		$foo =~ s/\\/\\\\/g;
+		print OUT "#define ENGINESDIR \"$foo\"\n";
+		}
 	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
 		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
 			if $export_var_as_fn;