This is a small patch to the Encode Makefile.PL's.  Three things:

    $ENV{PERL_CORE} isn't set for Makefile.PL's, only tests AFAIK.
    My mistake.  Since these are all MakeMaker functions you can
    check $self->{PERL_CORE} instead.

    The -I$(PERL_LIB) needs to be quoted so VMS preserves the -I's case.

    It doesn't hurt to quote simple command line switches on non-VMS.

With this plus the afforementioned MakeMaker patch, VMS is now 100%
for me.


--- ext/Encode/CN/Makefile.PL   2002/04/06 06:25:16     1.1
+++ ext/Encode/CN/Makefile.PL   2002/04/06 06:33:24
@@ -133,8 +133,8 @@
                $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")
--- ext/Encode/JP/Makefile.PL   2002/04/06 06:25:32     1.1
+++ ext/Encode/JP/Makefile.PL   2002/04/06 06:33:57
@@ -130,8 +130,8 @@
                $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")
--- ext/Encode/KR/Makefile.PL   2002/04/06 06:25:51     1.1
+++ ext/Encode/KR/Makefile.PL   2002/04/06 06:34:11
@@ -131,8 +131,8 @@
                $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")
--- ext/Encode/TW/Makefile.PL   2002/04/06 06:26:06     1.1
+++ ext/Encode/TW/Makefile.PL   2002/04/06 06:34:40
@@ -129,8 +129,8 @@
                $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")
--- ext/Encode/Byte/Makefile.PL 2002/04/06 06:23:13     1.1
+++ ext/Encode/Byte/Makefile.PL 2002/04/06 06:32:48
@@ -171,8 +171,8 @@
                $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")
--- ext/Encode/EBCDIC/Makefile.PL       2002/04/06 06:26:29     1.1
+++ ext/Encode/EBCDIC/Makefile.PL       2002/04/06 06:33:41
@@ -129,8 +129,8 @@
                $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")
--- ext/Encode/Symbol/Makefile.PL       2002/04/06 06:26:49     1.1
+++ ext/Encode/Symbol/Makefile.PL       2002/04/06 06:34:25
@@ -134,8 +134,8 @@
                $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")
--- ext/Encode/Makefile.PL      2002/04/06 06:24:20     1.1
+++ ext/Encode/Makefile.PL      2002/04/06 06:32:32
@@ -108,9 +108,9 @@
                $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: $!";

-- 

Michael G. Schwern   <[EMAIL PROTECTED]>    http://www.pobox.com/~schwern/
Perl Quality Assurance      <[EMAIL PROTECTED]>         Kwalitee Is Job One
If you'll mount me, I'll let you bomb Canada until they swoon.

Reply via email to