Integrate mainline

[p5sagit/p5-mst-13.2.git] / ext / Encode / CN / Makefile.PL

diff --git a/ext/Encode/CN/Makefile.PL b/ext/Encode/CN/Makefile.PL
index ffa9c76..3545a1d 100644 (file)
--- a/ext/Encode/CN/Makefile.PL
+++ b/ext/Encode/CN/Makefile.PL
@@ -12,7 +12,7 @@ my %tables = (euc_cn_t   => ['euc-cn.ucm',
 my $name = 'CN';
 
 WriteMakefile(
-              INC              => "-I..",
+              INC              => "-I../Encode",
              NAME              => 'Encode::'.$name,
              VERSION_FROM      => "$name.pm",
              OBJECT            => '$(O_FILES)',
@@ -43,7 +43,7 @@ sub post_initialize
     $self->{'O_FILES'} = [sort keys %o];
     my @files = ("$name.xs");
     $self->{'C'} = ["$name.c"];
-    $self->{'H'} = [$self->catfile($self->updir,'encode.h')];
+    $self->{'H'} = [$self->catfile($self->updir,'Encode', 'encode.h')];
     my %xs;
     foreach my $table (keys %tables) {
        push (@{$self->{'C'}},"$table.c");
@@ -61,7 +61,7 @@ sub post_initialize
 #include <perl.h>
 #include <XSUB.h>
 #define U8 U8
-#include "../encode.h"
+#include "encode.h"
 END
     foreach my $table (keys %tables) {
        print XS qq[#include "${table}.h"\n];
@@ -104,7 +104,7 @@ sub postamble
 {
     my $self = shift;
     my $dir  = $self->catdir($self->updir,'Encode');
-    my $str  = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by compile\n";
+    my $str  = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by enc2xs\n";
     $str    .= "$name.c : $name.xs ";
     foreach my $table (keys %tables)
     {
@@ -113,13 +113,13 @@ sub postamble
     $str .= "\n\n";
     $str .= "$name\$(OBJ_EXT) : $name.c\n\n";
 
-    my $compile = $self->catfile($self->updir,'compile');
+    my $enc2xs = $self->catfile($self->updir,'bin', 'enc2xs');
     foreach my $table (keys %tables)
     {
        my $numlines = 1;
        my $lengthsofar = length($str);
        my $continuator = '';
-       $str .= "$table.c : $compile Makefile.PL";
+       $str .= "$table.c : $enc2xs Makefile.PL";
        foreach my $file (@{$tables{$table}})
        {
            $str .= $continuator.' '.$self->catfile($dir,$file);
@@ -132,8 +132,8 @@ sub postamble
            }
        }
         $str .= $^O eq 'VMS' # In VMS quote to preserve case
-            ? qq{\n\t\$(PERL) $compile -"Q" -o \$\@ -f $table.fnm\n\n}
-            : qq{\n\t\$(PERL) $compile -Q -o \$\@ -f $table.fnm\n\n};
+            ? qq{\n\t\$(PERL) $enc2xs -"Q" -o \$\@ -f $table.fnm\n\n}
+            : qq{\n\t\$(PERL) $enc2xs -Q -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")
            || die "Could not open $table.fnm: $!";
        foreach my $file (@{$tables{$table}})