[svn:parrot] r37440 - trunk/config/inter

rurban at svn.parrot.org rurban at svn.parrot.org
Sun Mar 15 16:06:13 UTC 2009


Author: rurban
Date: Sun Mar 15 16:06:11 2009
New Revision: 37440
URL: https://trac.parrot.org/parrot/changeset/37440

Log:
[cage] use english: canidates => candidates

Modified:
   trunk/config/inter/make.pm

Modified: trunk/config/inter/make.pm
==============================================================================
--- trunk/config/inter/make.pm	Sun Mar 15 15:36:36 2009	(r37439)
+++ trunk/config/inter/make.pm	Sun Mar 15 16:06:11 2009	(r37440)
@@ -38,21 +38,21 @@
     # undef means we don't have GNU make... default to not having it
     $conf->data->set( gmake_version => undef );
 
-    my $canidates;
+    my $candidates;
     if ( $^O eq 'cygwin') {
         # On Cygwin prefer make over nmake.
-        $canidates = ['gmake', 'make'];
+        $candidates = ['gmake', 'make'];
     }
     elsif ($conf->option_or_data('cc') =~ /cl(\.exe)?$/i) {
         # Windows, Visual C++, prefer nmake
         # This test should use something more stable than the compiler
         # executable name.  'msvcversion' might be good, but is determined
         # after this check.
-        $canidates = [ 'nmake', 'mingw32-make', 'gmake', 'make' ];
+        $candidates = [ 'nmake', 'mingw32-make', 'gmake', 'make' ];
     }
     else {
         # Default
-        $canidates = ['gmake', 'mingw32-make', 'nmake', 'make'];
+        $candidates = ['gmake', 'mingw32-make', 'nmake', 'make'];
     }
 
     my $prog;
@@ -62,7 +62,7 @@
     # first pick wins.
     $prog ||= $ENV{ uc($util) };
     $prog ||= $conf->options->get($util);
-    $prog ||= check_progs( $canidates, $verbose );
+    $prog ||= check_progs( $candidates, $verbose );
     if ( !$prog ) {
         $prog = ( $conf->options->get('ask') )
             ? prompt( $prompt, $prog ? $prog : $conf->data->get($util) )
@@ -76,7 +76,7 @@
         $self->set_result('yes');
     }
     else {
-        $prog = check_progs( $canidates, $verbose );
+        $prog = check_progs( $candidates, $verbose );
 
         unless ($prog) {
 


More information about the parrot-commits mailing list