X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FEncode%2FMakefile.PL;h=2e74fe4034707a77b4db8664ba198d56eefa687d;hb=f0a41339d8cc9b81101f492ab383301252ea41fd;hp=9a1822417dd296f5a6537bbb6e8e31f02296cc2e;hpb=e1aed599ebc7bfaa5e43c8496e74c285a9b772c4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 9a18224..2e74fe4 100644
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -10,6 +10,8 @@ my %tables =
     (
      def_t => ['ascii.ucm',
 	       '8859-1.ucm',
+	       'null.ucm',
+	       'ctrl.ucm',
 	       ]
      );
 
@@ -75,6 +77,8 @@ sub post_initialize
     {
 	push (@files,$table.$ext);
     }
+    $self->{SOURCE} .= " $table.c"
+	if $^O eq 'MacOS' && $self->{SOURCE} !~ /\b$table\.c\b/;
 }
 $self->{'clean'}{'FILES'} .= join(' ',@files);
 return '';
@@ -85,7 +89,7 @@ sub postamble
     my $self = shift;
     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) :';
+    $str  .= $^O eq 'MacOS' ? 'Encode.c.{$(MACPERL_BUILD_EXT_STATIC)}.o :' : 'Encode$(OBJ_EXT) :';
     foreach my $table (keys %tables)
     {
 	$str .= " $table.c";