Encode tweaks for VMS

Message-ID: <20020406082609.GA28758@blackrider>

p4raw-id: //depot/perl@15771

diff --git a/ext/Encode/Byte/Makefile.PL b/ext/Encode/Byte/Makefile.PL
index 0d864bd..5f67d8b 100644 (file)
--- a/ext/Encode/Byte/Makefile.PL
+++ b/ext/Encode/Byte/Makefile.PL
@@ -171,8 +171,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q" -"O"' : '-Q -O'; 
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       my $ucopts = '-"Q" -"O"';
        $str .=  
            qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")

diff --git a/ext/Encode/CN/Makefile.PL b/ext/Encode/CN/Makefile.PL
index 3177043..46b262d 100644 (file)
--- a/ext/Encode/CN/Makefile.PL
+++ b/ext/Encode/CN/Makefile.PL
@@ -133,8 +133,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q"' : '-Q'; # VMS tweaks
+       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")

diff --git a/ext/Encode/EBCDIC/Makefile.PL b/ext/Encode/EBCDIC/Makefile.PL
index 574e1a4..f2113fa 100644 (file)
--- a/ext/Encode/EBCDIC/Makefile.PL
+++ b/ext/Encode/EBCDIC/Makefile.PL
@@ -129,8 +129,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q" -"O"' : '-Q -O'; 
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       my $ucopts = '-"Q" -"O"';
        $str .=  
            qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")

diff --git a/ext/Encode/JP/Makefile.PL b/ext/Encode/JP/Makefile.PL
index d49cc40..8cb0ce9 100644 (file)
--- a/ext/Encode/JP/Makefile.PL
+++ b/ext/Encode/JP/Makefile.PL
@@ -130,8 +130,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q"' : '-Q'; # VMS tweaks
+       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")

diff --git a/ext/Encode/KR/Makefile.PL b/ext/Encode/KR/Makefile.PL
index d8d3cb3..df0eeb6 100644 (file)
--- a/ext/Encode/KR/Makefile.PL
+++ b/ext/Encode/KR/Makefile.PL
@@ -131,8 +131,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q"' : '-Q'; # VMS tweaks
+       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")

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 912f14d..cd20547 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -108,9 +108,9 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q" -"O"' : '-Q -O'; 
-       $str .=  
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       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: $!";

diff --git a/ext/Encode/Symbol/Makefile.PL b/ext/Encode/Symbol/Makefile.PL
index 2462b82..a436b4d 100644 (file)
--- a/ext/Encode/Symbol/Makefile.PL
+++ b/ext/Encode/Symbol/Makefile.PL
@@ -134,8 +134,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q" -"O"' : '-Q -O'; 
+       my $plib   = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+       my $ucopts = '-"Q" -"O"';
        $str .=  
            qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
        open (FILELIST, ">$table.fnm")

diff --git a/ext/Encode/TW/Makefile.PL b/ext/Encode/TW/Makefile.PL
index 925fa32..8284ad0 100644 (file)
--- a/ext/Encode/TW/Makefile.PL
+++ b/ext/Encode/TW/Makefile.PL
@@ -129,8 +129,8 @@ sub postamble
                $continuator = '';
            }
        }
-       my $plib   = $ENV{PERL_CORE} ? '-I$(PERL_LIB)' : '';
-       my $ucopts = ($^O eq 'VMS')  ? '-"Q"' : '-Q'; # VMS tweaks
+       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")