diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-03-11 10:22:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-03-11 12:07:25 +0100 |
| commit | 97a0cc52812c6cc075ec7da849dd496f0e6cf5a4 (patch) | |
| tree | 9346dc6b04fcd96f887133edbbe81eebc50bcfee | |
| parent | c9dd49a751d4e73e6d891c006bb1d835ebfb8493 (diff) | |
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>
| -rw-r--r-- | Configurations/10-main.conf (renamed from Configurations) | 0 | ||||
| -rw-r--r-- | Configurations/90-team.conf (renamed from Configurations.team) | 0 | ||||
| -rwxr-xr-x | Configure | 4 | ||||
| -rw-r--r-- | Makefile.org | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Configurations b/Configurations/10-main.conf index 9c64956507..9c64956507 100644 --- a/Configurations +++ b/Configurations/10-main.conf diff --git a/Configurations.team b/Configurations/90-team.conf index cfc2b1653c..cfc2b1653c 100644 --- a/Configurations.team +++ b/Configurations/90-team.conf @@ -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($_); } diff --git a/Makefile.org b/Makefile.org index 4f5bff96e8..0d09ad4209 100644 --- a/Makefile.org +++ b/Makefile.org @@ -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 |