Permalink
Browse files

applied Adam Kennedy's patches from v2.16 and v2.17

git-svn-id: svn://svn.tt2.org/tt/Template2/trunk@1028 d5a88997-0a34-4036-9ed2-92fb5d660d91
  • Loading branch information...
1 parent 15c7899 commit 7cd902d8dc18b3f65398010cba2a4c795c67bcae @abw committed Feb 9, 2007
Showing with 11 additions and 2 deletions.
  1. +11 −2 Makefile.PL
View
@@ -27,7 +27,7 @@ if ($^O eq 'MSWin32') { # any others also?
$FLAVOUR = 'Win32';
$PREFIX = 'C:/Program Files/Template Toolkit 2';
$IMAGES = '/tt2/images';
- $MAKE = 'nmake';
+ $MAKE = 'dmake';
}
else {
$WIN32 = 0;
@@ -259,9 +259,18 @@ my %opts = (
},
);
+# 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;
-if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
+# Handle dev versions in our check
+my $mmv = $ExtUtils::MakeMaker::VERSION;
+$mmv =~ s/\_.+//;
+
+if ($mmv >= 5.43) {
$opts{ AUTHOR } = 'Andy Wardley <abw@wardley.org>';
$opts{ ABSTRACT } = 'comprehensive template processing system',
}

0 comments on commit 7cd902d

Please sign in to comment.