From: Richard Levitte <levitte@openssl.org>
Date: Tue, 13 Feb 2018 18:46:10 +0000 (+0100)
Subject: Configure: if a file is generated, never assume it's in the source dir
X-Git-Tag: OpenSSL_1_1_0h~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b91891043df21928b72d8093a22a396eca58aa5b;p=oweals%2Fopenssl.git

Configure: if a file is generated, never assume it's in the source dir

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5355)

(cherry picked from commit 9b7e82f8d939ca6894f941268b219da55f069b26)
---

diff --git a/Configure b/Configure
index 90a4651da1..bfd8b320c0 100755
--- a/Configure
+++ b/Configure
@@ -1757,7 +1757,7 @@ EOF
 
                 # If it isn't in the source tree, we assume it's generated
                 # in the build tree
-                if (! -f $s) {
+                if (! -f $s || $generate{$_}) {
                     $s = cleanfile($buildd, $_, $blddir);
                 }
                 # We recognise C and asm files
@@ -1783,7 +1783,7 @@ EOF
 
                 # If it isn't in the source tree, we assume it's generated
                 # in the build tree
-                if (! -f $s) {
+                if (! -f $s || $generate{$_}) {
                     $s = cleanfile($buildd, $_, $blddir);
                 }
                 # We recognise C and asm files