1 files changed, 9 insertions, 9 deletions

diff --git a/ext/Encode/Byte/Makefile.PL b/ext/Encode/Byte/Makefile.PL
index 4f1bd283a8..57ee63e63d 100644
--- a/ext/Encode/Byte/Makefile.PL
+++ b/ext/Encode/Byte/Makefile.PL
@@ -8,7 +8,7 @@ my %tables = (
 	      [
 	       'gsm0338.ucm',
 	       'nextstep.ucm',
-	       'roman8.ucm',
+	       'hp-roman8.ucm',
 	       'viscii.ucm',
 	       ],
 	      koi8_t => [ 'koi8-f.ucm', 'koi8-r.ucm', 'koi8-u.ucm', ],
@@ -41,7 +41,7 @@ while (defined(my $file = readdir(ENC)))
 closedir(ENC);
 
 WriteMakefile(
-              INC		=> "-I..",
+              INC		=> "-I../Encode",
 	      NAME		=> 'Encode::'.$name,
 	      VERSION_FROM	=> "$name.pm",
 	      OBJECT		=> '$(O_FILES)',
@@ -71,7 +71,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");
@@ -89,7 +89,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];
@@ -132,7 +132,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)
     {
@@ -141,13 +141,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);
@@ -160,8 +160,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}})