POSIX.xs: Never pass NULL to ctermid()

[perl5.git] / cpan / Unicode-Collate / Makefile.PL

diff --git a/cpan/Unicode-Collate/Makefile.PL b/cpan/Unicode-Collate/Makefile.PL
index 3270c66..1cb39a8 100644 (file)
--- a/cpan/Unicode-Collate/Makefile.PL
+++ b/cpan/Unicode-Collate/Makefile.PL
@@ -4,28 +4,28 @@ use ExtUtils::MakeMaker;
 my $clean = {};
 
 if (-f "Collate.xs") {
-    print STDERR "Making header files for XS...\n";
-
-    do 'mkheader' or die $@ || "mkheader: $!";
-
+    print "Making header files for XS...\n";
+    # Should $mkh be File::Spec->catfile(File::Spec->curdir(), 'mkheader') ?
+    my $mkh = './mkheader';
+    do $mkh or die $@ || "mkheader: $!";
     $clean = { FILES => 'ucatbl.h' };
 }
 
 WriteMakefile(
-    'AUTHOR'           => 'SADAHIRO Tomoyuki <SADAHIRO@cpan.org>',
-    'ABSTRACT'         => 'Unicode Collation Algorithm',
-    'INSTALLDIRS'      => $] >= 5.007002 ? 'perl' : 'site',
-    'LICENSE'          => 'perl',
-    'NAME'             => 'Unicode::Collate',
-    'VERSION_FROM'     => 'Collate.pm', # finds $VERSION
-    'clean'            => $clean,
-    'PREREQ_PM'                => {
-       Carp            => 0,
-       constant        => 0,
-       DynaLoader      => 0,
-       File::Spec      => 0,
-       strict          => 0,
-       Test            => 0,
-       warnings        => 0,
+    'AUTHOR'            => 'SADAHIRO Tomoyuki <SADAHIRO@cpan.org>',
+    'ABSTRACT'          => 'Unicode Collation Algorithm',
+    'INSTALLDIRS'       => ($] >= 5.007002 && $] < 5.011) ? 'perl' : 'site',
+                            # see perl5110delta, @INC reorganization
+    'LICENSE'           => 'perl',
+    'NAME'              => 'Unicode::Collate',
+    'VERSION_FROM'      => 'Collate.pm', # finds $VERSION
+    'clean'             => $clean,
+    'PREREQ_PM'         => {
+        Carp            => 0,
+        File::Spec      => 0,
+        XSLoader        => 0,
+        constant        => 0,
+        strict          => 0,
+        warnings        => 0,
     },
 );