about summary refs log tree commit
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2015-04-01 08:55:49 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2015-04-01 08:55:49 +0100
commite0eae7a292668ac71f5cdc5695b981241d7e205f (patch)
tree2deb3ff069f3a4ef5e591d7238a4b81df73f7772
parentf695c318f6877204753ef316dd87bb421d76ecfb (diff)
downloadperl-libnet-e0eae7a292668ac71f5cdc5695b981241d7e205f.tar.gz
Fix INSTALLDIRS to account for the @INC reordering change in Perl 5.12
-rw-r--r--Changes8
-rw-r--r--Makefile.PL2
2 files changed, 9 insertions, 1 deletions
diff --git a/Changes b/Changes
index ab564d0..3cb2928 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,14 @@ Revision history for Perl distribution libnet
 
 3.06 Development
 
+    - Fixed INSTALLDIRS to account for the @INC reordering change in Perl 5.12.
+      See Perl RT#116479 for details.  (libnet entered the perl core in Perl
+      5.7.3 so that's what the lower bound of the check should strictly be, but
+      since we only support Perl 5.8.1 and higher anyway it suffices to check
+      for Perl 5.8.  The upper bound is correctly Perl 5.11.0 since the @INC
+      reordering change in question (Perl core commit #b9ba2fadb1) first
+      appeared in Perl 5.11.0.)  [CPAN RT#103238]
+
     - Fixed Net::FTP authorize() method, which incorrectly interpreted the
       return value of the _RESP() method and falsely reported a failure.  [Troy
       Loveday, CPAN RT#48532]
diff --git a/Makefile.PL b/Makefile.PL
index b8dba7c..af24976 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -209,7 +209,7 @@ MAIN: {
             'vars'           => '0'
         },
 
-        INSTALLDIRS => 'perl',
+        INSTALLDIRS => ($] >= 5.008 && $] < 5.011) ? 'perl' : 'site',
 
         realclean => {
             FILES => $CfgFile