X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FEncode%2FKR%2FMakefile.PL;h=4ba99ab82d680ec4209e70331700ee2147973fe4;hb=af1f55d9c3a7b3b07efc4feaa402d004e3fc2106;hp=df7534d0d0d0a56b91b64c5aba6d2744e9739465;hpb=67d7b5efba6bec0629bea8f1e11cea68499f85da;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Encode/KR/Makefile.PL b/ext/Encode/KR/Makefile.PL
index df7534d..4ba99ab 100644
--- a/ext/Encode/KR/Makefile.PL
+++ b/ext/Encode/KR/Makefile.PL
@@ -1,14 +1,30 @@
 use 5.7.2;
 use strict;
 use ExtUtils::MakeMaker;
+use strict;
 
 my %tables = (euc_kr_t   => ['euc-kr.ucm',
+			     'macKorean.ucm',
 			     'cp949.ucm',
 			     ],
 	      '5601_t'   => ['ksc5601.ucm'],
 	      johab_t    => ['johab.ucm'],
              );
 
+unless ($ENV{AGGREGATE_TABLES}){
+    my @ucm;
+    for my $k (keys %tables){
+	push @ucm, @{$tables{$k}};
+    }
+    %tables = ();
+    my $seq = 0;
+    for my $ucm (sort @ucm){
+	# 8.3 compliance !
+	my $t = sprintf ("%s_%02d_t", substr($ucm, 0, 2), $seq++);
+	$tables{$t} = [ $ucm ];
+    }
+}
+
 my $name = 'KR';
 
 WriteMakefile(
@@ -48,7 +64,7 @@ sub post_initialize
 	push (@{$self->{'C'}},"$table.c");
 	# Do NOT add $table.h etc. to H_FILES unless we own up as to how they
 	# get built.
-	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);
 	}
     }
@@ -92,7 +108,7 @@ BOOT:
 {
 END
     foreach my $table (keys %tables) {
-	print XS qq[#include "${table}_def.h"\n];
+	print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
     close(XS);
@@ -102,8 +118,8 @@ END
 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 enc2xs\n";
+    my $dir  = $self->catdir($self->updir,'ucm');
+    my $str  = "# $name\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n";
     $str    .= "$name.c : $name.xs ";
     foreach my $table (keys %tables)
     {
@@ -130,9 +146,10 @@ 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)"' : '';
+	my $ucopts = '-"Q"';
+	$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}})