X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fmkfiles.pl;h=1326c9856a30be22a82b6960b2fdb169d669dbbb;hb=592a207b94dadbd03f352e8f74133efc0a141e3d;hp=584c3912e6ec1ac6a67b89af3a2a8592c262777c;hpb=96afc1cfd53a0ffcca8544fa751eb9bf17749133;p=oweals%2Fopenssl.git

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 584c3912e6..1326c9856a 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -46,6 +46,7 @@ my @dirs = (
 "crypto/pem",
 "crypto/x509",
 "crypto/x509v3",
+"crypto/cms",
 "crypto/conf",
 "crypto/txt_db",
 "crypto/pkcs7",
@@ -55,17 +56,20 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 "crypto/krb5",
-"crypto/store",
+#"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
 "ssl",
 "apps",
 "engines",
+"engines/ccgost",
 "test",
 "tools"
 );
 
+%top;
+
 foreach (@dirs) {
 	&files_dir ($_, "Makefile");
 }
@@ -109,8 +113,8 @@ while (<IN>)
 		$o =~ s/\s+$//;
 		$o =~ s/\s+/ /g;
 
-		$o =~ s/\$[({]([^)}]+)[)}]/$sym{$1}/g;
-		$sym{$s}=$o;
+		$o =~ s/\$[({]([^)}]+)[)}]/$top{$1} or $sym{$1}/ge;
+		$sym{$s}=($top{$s} or $o);
 		}
 	}
 
@@ -120,6 +124,15 @@ foreach (sort keys %sym)
 	{
 	print "$_=$sym{$_}\n";
 	}
+if ($dir eq "." && defined($sym{"BUILDENV"}))
+	{
+	foreach (split(' ',$sym{"BUILDENV"}))
+		{
+		/^(.+)=/;
+		$top{$1}=$sym{$1};
+		}
+	}
+
 print "RELATIVE_DIRECTORY=\n";
 
 close (IN);