[Catalyst-commits] r11521 - Catalyst-Runtime/5.80/trunk

[dhoss at dev.catalyst.perl.org]

Author: dhoss
Date: 2009-10-14 00:14:42 +0000 (Wed, 14 Oct 2009)
New Revision: 11521

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
Log:
Snow Leopard uses COPYFILE_DISABLE

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-10-13 14:44:37 UTC (rev 11520)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-10-14 00:14:42 UTC (rev 11521)
@@ -149,8 +149,8 @@
 
         # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
         # On 10.5 (Leopard) it wants COPYFILE_DISABLE
-        die("Oh, you got Snow Lepoard, snazzy. Please read the man page for tar to find out if Apple renamed COPYFILE_DISABLE again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.6/;
-        my $attr = $osx_ver =~ /^10.5/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
+        # die("Oh, you got Snow Lepoard, snazzy. Please read the man page for tar to find out if Apple renamed COPYFILE_DISABLE again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.6/;
+        my $attr = $osx_ver =~ /^10.(5|6)/  ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
 
         makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}.
                                           qq{ echo "You must set the ENV variable $attr to true,"; }.