Changeset 4188 for inc

Show
Ignore:
Timestamp:
05/31/05 06:44:23 (4 years ago)
Author:
Darren_Duncan
svk:copy_cache_prev:
5706
Message:

undid r4185's change to Makefile.pm and redid the fix properly, by altering inc/Module/Install/Pugs.pm to not add the offending section in the first place

Location:
inc/Module/Install
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • inc/Module/Install/Makefile.pm

    r4185 r4188  
    126126    $makefile =~ s/^(PERL = .*)/$1 -Iinc/m; 
    127127 
    128     $makefile =~ s|\@ARGV = grep !/\[A-Z\]/, map glob, \@ARGV;|\@ARGV = map glob, \@ARGV;|; 
    129  
    130128    open MAKEFILE, '> Makefile' or die $!; 
    131129    print MAKEFILE "$preamble$makefile$postamble"; 

  • inc/Module/Install/Pugs.pm

    r3846 r4188  
    108108    $full_blib =~ s{\\}{\\\\}g; 
    109109    $full_blib =~ s{'}{\\'}g; 
    110     $makefile =~ s/\b(runtests \@ARGV|test_harness\(\$\(TEST_VERBOSE\), )/ENV->{HARNESS_PERL} = q{$full_pugs}; \@ARGV = grep !\/[A-Z]\/, map glob, \@ARGV; ENV->{PERL6LIB} = q{$full_blib}; $1/; 
     110    $makefile =~ s/\b(runtests \@ARGV|test_harness\(\$\(TEST_VERBOSE\), )/ENV->{HARNESS_PERL} = q{$full_pugs}; \@ARGV = map glob, \@ARGV; ENV->{PERL6LIB} = q{$full_blib}; $1/; 
    111111    $makefile =~ s!("-MExtUtils::Command::MM")!"-I../../inc" "-I../inc" "-Iinc" $1!g; 
    112112    $makefile =~ s/\$\(UNINST\)/0/g;