--- IO-AIO/Makefile.PL	2013/06/10 01:50:24	1.31
+++ IO-AIO/Makefile.PL	2015/06/13 00:06:13	1.34
@@ -1,4 +1,4 @@
-use 5.008002;
+use Canary::Stability IO::AIO => 1, 5.008002;
 
 use ExtUtils::MakeMaker;
 
@@ -23,7 +23,7 @@
 
 EOF
 
-   if ($Config{cc} =~ /[\\\/]gcc.*\.exe/) {
+   if ($Config{cc} =~ /(?:^|\\|\/)gcc(?:|.*\.exe)$/) {
       $INC  = "$ENV{INC} -I/gtk/include";
       $LIBS = ["$ENV{LIBS} -L/gtk/lib -lpthreadGC2"];
    } else {
@@ -108,8 +108,9 @@
     LIBS         => $LIBS,
     EXE_FILES    => ["bin/treescan"],
     PM           => {
-       'AIO.pm'		=> '$(INST_LIBDIR)/AIO.pm',
+       'AIO.pm'		=> '$(INST_LIB)/IO/AIO.pm',
     },
+    CONFIGURE_REQUIRES => { ExtUtils::MakeMaker => 6.52, Canary::Stability => 2001 },
     PREREQ_PM => {
        "common::sense" => 0,
     },