No semicolons after blocks.

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

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index a01ff71..cd20547 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -1,7 +1,11 @@
-use 5.7.2;
-use strict;
+use 5.007003;
 use ExtUtils::MakeMaker;
 
+# Just for sure :)
+unless($ENV{PERL_CORE}) {
+    $ENV{PERL_CORE} = 1 if ($^X =~ m{\bminiperl[^/\\\]>:]*$}o);
+}
+
 my %tables = 
     (
      def_t => ['ascii.ucm',
@@ -9,13 +13,20 @@ my %tables =
               ]
      );
 
-my @exe_files = ();
-my @more_exe_files = qw(bin/enc2xs bin/piconv);
-
+my @exe_files = qw(bin/enc2xs
+                  bin/piconv
+                  );
+my @more_exe_files = qw(
+                       unidump
+                       );
+my @pmlibdirs = qw(lib Encode);
 for my $arg (@ARGV){
-    if ($arg eq "USE_SCRIPTS"){
+    if ($arg eq "MORE_SCRIPTS"){
        push @exe_files, @more_exe_files;
     }
+    if ($arg eq "INSTALL_UCM"){
+       push @pmlibdirs, "ucm";
+    }
 }
 
 WriteMakefile(
@@ -29,7 +40,8 @@ WriteMakefile(
                  DIST_DEFAULT => 'all tardist',
              },
              MAN3PODS  => {},
-             INC       => "-I./Encode"
+             INC       => "-I./Encode",
+             PMLIBDIRS => \@pmlibdirs,
              );
 
 package MY;
@@ -58,7 +70,7 @@ sub post_initialize
     my @files;
     foreach my $table (keys %tables)
     {
-       foreach my $ext (qw($(OBJ_EXT) .c .h _def.h .fnm))
+       foreach my $ext (qw($(OBJ_EXT) .c .h .exh .fnm))
     {
        push (@files,$table.$ext);
     }
@@ -70,8 +82,8 @@ return '';
 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 enc2xs\n";
+    my $dir  = $self->catdir($self->curdir,'ucm');
+    my $str  = "# Encode\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n";
     $str  .= 'Encode$(OBJ_EXT) :';
     foreach my $table (keys %tables)
     {
@@ -96,9 +108,10 @@ sub postamble
                $continuator = '';
            }
        }
-        $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};
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       my $ucopts = '-"Q" -"O"';
+       $str .=
+           qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")
            || die "Could not open $table.fnm: $!";
        foreach my $file (@{$tables{$table}})