randyk 2003/10/08 22:10:29
Modified: . Makefile.PL Changes Log: Submitted by: Steve Hay Reviewed by: randyk Fix a bug in Makefile.PL where it would, under certain circumstances, pick up the wrong Perl include directory. Revision Changes Path 1.218 +1 -1 modperl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- Makefile.PL 27 Sep 2003 20:06:58 -0000 1.217 +++ Makefile.PL 9 Oct 2003 05:10:29 -0000 1.218 @@ -2229,7 +2229,7 @@ } elsif (/ADD CPP/) { my $apache_inc = win32_fix_path_dsp($win32_path{APACHE_INC}); - s!(/D "WIN32")!/I "$apache_inc" /I "$apache_inc/../os/win32" /I "$perl_inc" $1!; + s!/I "\\Perl\\lib\\CORE"!/I "$apache_inc" /I "$apache_inc/../os/win32" /I "$perl_inc"!; s!(/D "WIN32")!$1 /D "EAPI" ! if $win32_args{EAPI}; print NEWDSP $_; } 1.683 +4 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.682 retrieving revision 1.683 diff -u -r1.682 -r1.683 --- Changes 8 Oct 2003 04:37:10 -0000 1.682 +++ Changes 9 Oct 2003 05:10:29 -0000 1.683 @@ -10,6 +10,10 @@ =item 1.29_01-dev +Fix a bug in Makefile.PL for Win32 where it would, in +certain cases, pick up the wrong Perl include directory +[Steve Hay] + =item 1.29 - Oct 7, 2003 Add a workaround for the 'rand' bug for perl 5.8.1 (compiled with