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>

diff --git a/Configurations b/Configurations/10-main.conf
similarity index 100%
rename from Configurations
rename to Configurations/10-main.conf

diff --git a/Configurations.team b/Configurations/90-team.conf
similarity index 100%
rename from Configurations.team
rename to Configurations/90-team.conf

diff --git a/Configure b/Configure
index 5dbfa6cccfcfa5e69166705592f7db9489723c65..4094c08d4c2a4f2588795f14c62cfca6bb5855e0 100755 (executable)
--- 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($_);
 }
 

diff --git a/Makefile.org b/Makefile.org
index 4f5bff96e803c7fe8d47c970bac043037afc723f..0d09ad420955ef3219c0fdc72979a8a5105e5bdb 100644 (file)
--- 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