[Encode] 1.74 released -- final for 5.8.0-RC1

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

diff --git a/ext/Encode/Symbol/Makefile.PL b/ext/Encode/Symbol/Makefile.PL
index a090bed..045cc16 100644 (file)
--- a/ext/Encode/Symbol/Makefile.PL
+++ b/ext/Encode/Symbol/Makefile.PL
@@ -4,7 +4,15 @@ use ExtUtils::MakeMaker;
 
 my $name = 'Symbol';
 my %tables = (
-             symbol_t => ['symbol.ucm','dingbats.ucm', 'macDingbats.ucm'],
+             symbol_t => [qw(
+                             symbol.ucm
+                             dingbats.ucm
+                             adobeSymbol.ucm
+                             adobeZdingbat.ucm
+                             macSymbol.ucm
+                             macDingbats.ucm
+                             )
+                             ],
              );
 
 WriteMakefile(
@@ -38,6 +46,8 @@ sub post_initialize
     $self->{'O_FILES'} = [sort keys %o];
     my @files = ("$name.xs");
     $self->{'C'} = ["$name.c"];
+    $self->{SOURCE} .= " $name.c"
+        if $^O eq 'MacOS' && $self->{SOURCE} !~ /\b$name\.c\b/;
     $self->{'H'} = [$self->catfile($self->updir,'Encode', 'encode.h')];
     my %xs;
     foreach my $table (keys %tables) {
@@ -47,6 +57,8 @@ sub post_initialize
        foreach my $ext (qw($(OBJ_EXT) .c .h .exh .fnm)) {
            push (@files,$table.$ext);
        }
+       $self->{SOURCE} .= " $table.c"
+           if $^O eq 'MacOS' && $self->{SOURCE} !~ /\b$table\.c\b/;
     }
     $self->{'XS'} = { "$name.xs" => "$name.c" };
     $self->{'clean'}{'FILES'} .= join(' ',@files);
@@ -126,9 +138,11 @@ sub postamble
                $continuator = '';
            }
        }
-        $str .= $^O eq 'VMS' # In VMS quote to preserve case
-            ? qq{\n\t\$(PERL) $enc2xs -"Q" -o \$\@ -f $table.fnm\n\n}
-            : qq{\n\t\$(PERL) $enc2xs -Q -o \$\@ -f $table.fnm\n\n};
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       $plib .= " -MCross=$::Cross::platform" if defined $::Cross::platform;
+       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}})