Consistent Config/Macro values

Author: toddr

configpm

@@ -239,10 +239,10 @@ my %seen_quotes;
 
     # grandfather PATCHLEVEL and SUBVERSION and CONFIG
     if ($k) {
-	if ($k eq 'PERL_VERSION_MINOR') {
+	if ($k eq 'PERL_VERSION') {
 	    push @v_others, "PATCHLEVEL='$v'\n";
 	}
-	elsif ($k eq 'PERL_VERSION_PATCH') {
+	elsif ($k eq 'PERL_SUBVERSION') {
 	    push @v_others, "SUBVERSION='$v'\n";
 	}
 	elsif ($k eq 'PERL_CONFIG_SH') {

lib/Config.t

@@ -31,8 +31,8 @@ ok(!exists($Config{"\n$first"}),
 is($Config{PERL_VERSION_MAJOR}, 7, "PERL_VERSION_MAJOR is 7");
 
 # Check that old config variable names are aliased to their new ones.
-my %grandfathers = ( PERL_VERSION_MINOR       => 'PATCHLEVEL',
-                     PERL_VERSION_PATCH    => 'SUBVERSION',
+my %grandfathers = ( PERL_VERSION       => 'PATCHLEVEL',
+                     PERL_SUBVERSION    => 'SUBVERSION',
                      PERL_CONFIG_SH     => 'CONFIG'
                    );
 while( my($new, $old) = each %grandfathers ) {