2 files changed, 21 insertions, 17 deletions

diff --git a/ext/Encode/CN/CN.pm b/ext/Encode/CN/CN.pm
index 9ad7ace6ed..5f8d440dc8 100644
--- a/ext/Encode/CN/CN.pm
+++ b/ext/Encode/CN/CN.pm
@@ -4,7 +4,7 @@ BEGIN {
 	die "Encode::CN not supported on EBCDIC\n";
     }
 }
-our $VERSION = do { my @r = (q$Revision: 0.99 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.0 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 use Encode;
 use Encode::CN::HZ;
@@ -12,13 +12,12 @@ use XSLoader;
 XSLoader::load('Encode::CN',$VERSION);
 
 # Relocated from Encode.pm
-# CP936 doesn't have vendor-addon for GBK, so they're identical.
-Encode::define_alias( qr/^gbk$/i => '"cp936"');
 
-use Encode::CN::2022_CN;
+# use Encode::CN::2022_CN;
 
 1;
 __END__
+
 =head1 NAME
 
 Encode::CN - China-based Chinese Encodings
@@ -36,10 +35,11 @@ Encodings supported are as follows.
 
   Canonical   Alias		Description
   --------------------------------------------------------------------
-  euc-cn      /euc.*cn$/i	EUC (Extended Unix Character)
-	      /cn.*euc$/i
-  gb2312			The raw (low-bit) GB2312 character map
-  gb12345			Traditional chinese counterpart to 
+  euc-cn      /\beuc.*cn$/i	EUC (Extended Unix Character)
+	      /\bcn.*euc$/i
+              /\bGB[-_ ]?2312(?:\D.*$|$)/i (see below)
+  gb2312-raw			The raw (low-bit) GB2312 character map
+  gb12345-raw			Traditional chinese counterpart to 
 				GB2312 (raw)
   iso-ir-165			GB2312 + GB6345 + GB8565 + additions
   cp936				Code Page 936, also known as GBK 
@@ -57,6 +57,10 @@ also contains extra Taiwan-based encodings.
 
 =head1 BUGS
 
+When you see C<charset=gb2312> on mails and web pages, they really
+mean "euc-cn" encodings.  To fix that, gb2312 is aliased to euc-cn.  Use
+gb2312-raw when you really mean it.
+
 ASCII part (0x00-0x7f) is preserved for all encodings, even though it
 conflicts with mappings by the Unicode Consortium.  See
 
@@ -66,6 +70,6 @@ to find why it is implemented that way.
 
 =head1 SEE ALSO
 
-L<Encode>
+L<Encode>,L<Encode::CJKguide>
 
 =cut
diff --git a/ext/Encode/CN/Makefile.PL b/ext/Encode/CN/Makefile.PL
index ffa9c766b0..3545a1d0ee 100644
--- a/ext/Encode/CN/Makefile.PL
+++ b/ext/Encode/CN/Makefile.PL
@@ -12,7 +12,7 @@ my %tables = (euc_cn_t   => ['euc-cn.ucm',
 my $name = 'CN';
 
 WriteMakefile(
-              INC		=> "-I..",
+              INC		=> "-I../Encode",
 	      NAME		=> 'Encode::'.$name,
 	      VERSION_FROM	=> "$name.pm",
 	      OBJECT		=> '$(O_FILES)',
@@ -43,7 +43,7 @@ sub post_initialize
     $self->{'O_FILES'} = [sort keys %o];
     my @files = ("$name.xs");
     $self->{'C'} = ["$name.c"];
-    $self->{'H'} = [$self->catfile($self->updir,'encode.h')];
+    $self->{'H'} = [$self->catfile($self->updir,'Encode', 'encode.h')];
     my %xs;
     foreach my $table (keys %tables) {
 	push (@{$self->{'C'}},"$table.c");
@@ -61,7 +61,7 @@ sub post_initialize
 #include <perl.h>
 #include <XSUB.h>
 #define U8 U8
-#include "../encode.h"
+#include "encode.h"
 END
     foreach my $table (keys %tables) {
 	print XS qq[#include "${table}.h"\n];
@@ -104,7 +104,7 @@ 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 compile\n";
+    my $str  = "# $name\$(OBJ_EXT) depends on .h and _def.h files not .c files - but all written by enc2xs\n";
     $str    .= "$name.c : $name.xs ";
     foreach my $table (keys %tables)
     {
@@ -113,13 +113,13 @@ sub postamble
     $str .= "\n\n";
     $str .= "$name\$(OBJ_EXT) : $name.c\n\n";
 
-    my $compile = $self->catfile($self->updir,'compile');
+    my $enc2xs = $self->catfile($self->updir,'bin', 'enc2xs');
     foreach my $table (keys %tables)
     {
 	my $numlines = 1;
 	my $lengthsofar = length($str);
 	my $continuator = '';
-	$str .= "$table.c : $compile Makefile.PL";
+	$str .= "$table.c : $enc2xs Makefile.PL";
 	foreach my $file (@{$tables{$table}})
 	{
 	    $str .= $continuator.' '.$self->catfile($dir,$file);
@@ -132,8 +132,8 @@ sub postamble
 	    }
 	}
         $str .= $^O eq 'VMS' # In VMS quote to preserve case
-            ? qq{\n\t\$(PERL) $compile -"Q" -o \$\@ -f $table.fnm\n\n}
-            : qq{\n\t\$(PERL) $compile -Q -o \$\@ -f $table.fnm\n\n};
+            ? qq{\n\t\$(PERL) $enc2xs -"Q" -o \$\@ -f $table.fnm\n\n}
+            : qq{\n\t\$(PERL) $enc2xs -Q -o \$\@ -f $table.fnm\n\n};
 	open (FILELIST, ">$table.fnm")
 	    || die "Could not open $table.fnm: $!";
 	foreach my $file (@{$tables{$table}})