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>
This commit is contained in:
parent
c9dd49a751
commit
97a0cc5281
@ -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($_);
|
||||
}
|
||||
|
||||
|
@ -500,7 +500,7 @@ crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
|
||||
$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
|
||||
|
||||
|
||||
TABLE: Configure Configurations Configurations.team
|
||||
TABLE: Configure Configurations/*.conf
|
||||
(echo 'Output of `Configure TABLE'"':"; \
|
||||
$(PERL) Configure TABLE) > TABLE
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user