aboutsummaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-03-11 10:22:50 +0100
committerRichard Levitte <levitte@openssl.org>2015-03-11 12:07:25 +0100
commit97a0cc52812c6cc075ec7da849dd496f0e6cf5a4 (patch)
tree9346dc6b04fcd96f887133edbbe81eebc50bcfee /Configure
parentc9dd49a751d4e73e6d891c006bb1d835ebfb8493 (diff)
downloadopenssl-97a0cc52812c6cc075ec7da849dd496f0e6cf5a4.tar.gz
Move Configurations* out of the way and rename them.
Configure would load the glob "Configurations*". The problem with this is that it also loads all kinds of backups of those configurations that some editors do, like emacs' classic 'Configurations~'. The solution is to give them an extension, such as '.conf', and make sure to end the glob with that. Also, because 'Configurations.conf' makes for a silly name, and because a possibly large number of configurations will become clutter, move them to a subdirectory 'Configurations/', and rename them to something more expressive, as well as something that sets up some form of sorting order. Thus: Configurations -> Configurations/10-main.conf Configurations.team -> Configurations/90-team.conf Finally, make sure that Configure sorts the list of files that 'glob' produces, and adapt Makefile.org. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configure b/Configure
index 5dbfa6cccf..4094c08d4c 100755
--- a/Configure
+++ b/Configure
@@ -184,8 +184,8 @@ sub read_config {
}
my ($vol, $dir, $dummy) = File::Spec->splitpath($0);
-my $pattern = File::Spec->catpath($vol, $dir, "Configurations*");
-foreach ( glob($pattern) ) {
+my $pattern = File::Spec->catpath($vol, $dir, "Configurations/*.conf");
+foreach (sort glob($pattern) ) {
&read_config($_);
}