Upgrade to Encode 1.00, from Dan Kogai.

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

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 042225c..a01ff71 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -2,24 +2,25 @@ use 5.7.2;
 use strict;
 use ExtUtils::MakeMaker;
 
-my %tables = (8859 => ['ascii.ucm', 'cp1250.ucm', 'koi8-r.ucm', 'jis0201.ucm' ],
-              EBCDIC  => ['cp1047.ucm','cp37.ucm','posix-bc.ucm'],
-              Symbols => ['symbol.ucm','dingbats.ucm'],
-             );
+my %tables = 
+    (
+     def_t => ['ascii.ucm',
+              '8859-1.ucm',
+              ]
+     );
 
-opendir(ENC,'Encode');
-while (defined(my $file = readdir(ENC)))
-{
-    if ($file =~ /8859.*\.ucm/)
-    {
-       push(@{$tables{8859}},$file);
+my @exe_files = ();
+my @more_exe_files = qw(bin/enc2xs bin/piconv);
+
+for my $arg (@ARGV){
+    if ($arg eq "USE_SCRIPTS"){
+       push @exe_files, @more_exe_files;
     }
 }
-closedir(ENC);
-
 
 WriteMakefile(
              NAME              => "Encode",
+             EXE_FILES         => \@exe_files,
              VERSION_FROM      => 'Encode.pm',
              OBJECT            => '$(O_FILES)',
              'dist'            => {
@@ -28,6 +29,7 @@ WriteMakefile(
                  DIST_DEFAULT => 'all tardist',
              },
              MAN3PODS  => {},
+             INC       => "-I./Encode"
              );
 
 package MY;
@@ -69,7 +71,7 @@ sub postamble
 {
     my $self = shift;
     my $dir  = $self->catdir($self->curdir,'Encode');
-    my $str  = "# Encode\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by compile\n";
+    my $str  = "# Encode\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by enc2xs\n";
     $str  .= 'Encode$(OBJ_EXT) :';
     foreach my $table (keys %tables)
     {
@@ -81,7 +83,8 @@ sub postamble
        my $numlines = 1;
        my $lengthsofar = length($str);
        my $continuator = '';
-       $str .= "$table.c : compile Makefile.PL";
+       my $enc2xs = $self->catfile('bin', 'enc2xs');
+       $str .= "$table.c : $enc2xs Makefile.PL";
        foreach my $file (@{$tables{$table}})
        {
            $str .= $continuator.' '.$self->catfile($dir,$file);
@@ -93,11 +96,9 @@ sub postamble
                $continuator = '';
            }
        }
-       if ($^O eq 'VMS' ) { # quote to preserve case
-           $str .= qq{\n\t\$(PERL) compile -"O" -o \$\@ -f $table.fnm\n\n};
-       } else {
-           $str .= qq{\n\t\$(PERL) compile -O -o \$\@ -f $table.fnm\n\n};
-       }
+        $str .= $^O eq 'VMS' # In VMS quote to preserve case
+            ? qq{\n\t\$(PERL) $enc2xs -"Q" -"O" -o \$\@ -f $table.fnm\n\n}
+            : qq{\n\t\$(PERL) $enc2xs -Q -O -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")
            || die "Could not open $table.fnm: $!";
        foreach my $file (@{$tables{$table}})