[Templates-cvs] cvs commit: Template2 Makefile.PL

[cvs@template-toolkit.org]

cvs         07/02/09 16:22:34

  Modified:    .        Makefile.PL
  Log:
  applied Adam Kennedy's patches from v2.16 and v2.17
  
  Revision  Changes    Path
  2.47      +11 -2     Template2/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /template-toolkit/Template2/Makefile.PL,v
  retrieving revision 2.46
  retrieving revision 2.47
  diff -u -r2.46 -r2.47
  --- Makefile.PL	2006/05/26 13:44:21	2.46
  +++ Makefile.PL	2007/02/09 16:22:34	2.47
  @@ -27,7 +27,7 @@
       $FLAVOUR = 'Win32';
       $PREFIX  = 'C:/Program Files/Template Toolkit 2';
       $IMAGES  = '/tt2/images';
  -    $MAKE    = 'nmake';
  +    $MAKE    = 'dmake';
   }
   else {
       $WIN32   = 0;
  @@ -259,9 +259,18 @@
       },
   );
   
  +# On mac, make sure we have an unbroken File::HomeDir
  +if ( $^O eq 'darwin' ) {
  +       $opts{PREREQ_PM}->{'File::HomeDir'} = '0.64';
  +}
  +
   push @{ $opts{'DIR'} }, 'xs' if $TT_XS_ENABLE;
  +
  +# Handle dev versions in our check
  +my $mmv = $ExtUtils::MakeMaker::VERSION;
  +$mmv =~ s/\_.+//;
   
  -if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
  +if ($mmv >= 5.43) {
       $opts{ AUTHOR   } = 'Andy Wardley <abw@wardley.org>';
       $opts{ ABSTRACT } = 'comprehensive template processing system',
   }