Author: stas Date: Tue Dec 7 21:56:34 2004 New Revision: 111220 URL: http://svn.apache.org/viewcvs?view=rev&rev=111220 Log: make sure that ABSPERLRUN and ABSPERLRUN are defined in src/modules/perl/Makefile (needed by win32 build)
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/Apache/Build.pm Modified: perl/modperl/trunk/Changes Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=111220&p1=perl/modperl/trunk/Changes&r1=111219&p2=perl/modperl/trunk/Changes&r2=111220 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Tue Dec 7 21:56:34 2004 @@ -12,6 +12,9 @@ =item 1.99_18-dev +make sure that ABSPERLRUN and ABSPERLRUN are defined in +src/modules/perl/Makefile (needed by win32 build) [Stas] + For static builds, mod_perl header files were being installed into apache's source tree instead of where apache installed it's own headers [Gozer] Modified: perl/modperl/trunk/lib/Apache/Build.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Build.pm?view=diff&rev=111220&p1=perl/modperl/trunk/lib/Apache/Build.pm&r1=111219&p2=perl/modperl/trunk/lib/Apache/Build.pm&r2=111220 ============================================================================== --- perl/modperl/trunk/lib/Apache/Build.pm (original) +++ perl/modperl/trunk/lib/Apache/Build.pm Tue Dec 7 21:56:34 2004 @@ -1359,6 +1359,8 @@ #when we use a bit of MakeMaker, make it use our values for these vars my %perl_config_pm_alias = ( + ABSPERL => 'perlpath', + ABSPERLRUN => 'perlpath', PERL => 'perlpath', PERLRUN => 'perlpath', PERL_LIB => 'privlibexp', @@ -1367,9 +1369,8 @@ my $mm_replace = join '|', keys %perl_config_pm_alias; -my @perl_config_pm = - (qw(cc cpprun rm ranlib lib_ext obj_ext cccdlflags lddlflags optimize), - values %perl_config_pm_alias); +my @perl_config_pm = (values(%perl_config_pm_alias), qw(cc cpprun + rm ranlib lib_ext obj_ext cccdlflags lddlflags optimize)); sub mm_replace { my $val = shift;