Sync ordinals with stable branch.

[openssl.git] / util / mkfiles.pl

diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index 55a313cdb0ec3de02ddfdf9b4fbbd63e240cd58a..1326c9856a30be22a82b6960b2fdb169d669dbbb 100755 (executable)
--- 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,7 +56,7 @@ my @dirs = (
 "crypto/ocsp",
 "crypto/ui",
 "crypto/krb5",
-"crypto/store",
+#"crypto/store",
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
@@ -67,6 +68,8 @@ my @dirs = (
 "tools"
 );
 
+%top;
+
 foreach (@dirs) {
        &files_dir ($_, "Makefile");
 }
@@ -110,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);
                }
        }
 
@@ -121,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);