stas 2003/03/12 22:10:46
Modified: . Makefile.PL Changes lib/Apache Build.pm Log: 'make install' now installs mod_perl*h files under httpd's include tree Revision Changes Path 1.92 +20 -8 modperl-2.0/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- Makefile.PL 31 Jan 2003 00:52:21 -0000 1.91 +++ Makefile.PL 13 Mar 2003 06:10:46 -0000 1.92 @@ -64,19 +64,26 @@ 'lib/Apache2.pm' => 'blib/lib/Apache2.pm', ); +# these h files need to be installed system-wide so 3rd party XS +# extensions can use them +my @xs_h_files = map catfile("xs", $_), + qw(modperl_xs_sv_convert.h modperl_xs_typedefs.h modperl_xs_util.h); + ModPerl::MM::WriteMakefile( NAME => 'mod_perl', VERSION => $VERSION, DIR => get_dirs_with_makefile(@remote_makefile_dirs), macro => { - MODPERL_SRC => $code->path, - MODPERL_MAKEFILE => basename($build->default_file('makefile')), - MAKE_F => '$(MAKE) ' . (WIN32 ? '/f' : '-f'), - MODPERL_LIBMAKE => '$(MAKE) -f $(MODPERL_MAKEFILE)', - PERL => $build->perl_config('perlpath'), - MOD_INSTALL => ModPerl::MM::mod_install(), - APACHE_PREFIX => $build->apxs('-q' => 'prefix'), - APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'), + MODPERL_SRC => $code->path, + MODPERL_MAKEFILE => basename($build->default_file('makefile')), + MAKE_F => '$(MAKE) ' . (WIN32 ? '/f' : '-f'), + MODPERL_LIBMAKE => '$(MAKE) -f $(MODPERL_MAKEFILE)', + PERL => $build->perl_config('perlpath'), + MOD_INSTALL => ModPerl::MM::mod_install(), + APACHE_PREFIX => $build->apxs('-q' => 'prefix'), + APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'), + APACHE_INCLUDEDIR => $build->apxs('-q' => 'includedir'), + MODPERL_XS_H_FILES => join(" \\\n\t", @xs_h_files), }, clean => { FILES => "@{ clean_files() }", @@ -420,6 +427,10 @@ modperl_lib_install: cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install +modperl_xs_h_install: + @$(MKPATH) $(MODPERL_AP_INCLUDEDIR) + $(CP) $(MODPERL_XS_H_FILES) $(APACHE_INCLUDEDIR) + modperl_src_clean: cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean @@ -432,6 +443,7 @@ my $self = shift; my $string = $self->MM::install(@_); ModPerl::MM::add_dep(\$string, pure_install => 'modperl_lib_install'); + ModPerl::MM::add_dep(\$string, pure_install => 'modperl_xs_h_install'); $string; } 1.148 +3 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- Changes 9 Mar 2003 08:57:55 -0000 1.147 +++ Changes 13 Mar 2003 06:10:46 -0000 1.148 @@ -10,6 +10,9 @@ =item 1.99_09-dev +'make install' now installs mod_perl*h files under httpd's include +tree [Stas] + When PerlOptions +ParseHeaders is an effect, the CGI headers parsing won't be done if any *mod_perl* handler before and including the response phase, sets $r->content_type. (similar behavior to mp1's 1.112 +5 -1 modperl-2.0/lib/Apache/Build.pm Index: Build.pm =================================================================== RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- Build.pm 1 Feb 2003 07:46:24 -0000 1.111 +++ Build.pm 13 Mar 2003 06:10:46 -0000 1.112 @@ -1036,7 +1036,7 @@ print $fh $self->canon_make_attr('lib', "@libs"); - for my $q (qw(LIBEXECDIR)) { + for my $q (qw(LIBEXECDIR INCLUDEDIR)) { print $fh $self->canon_make_attr("AP_$q", $self->apxs(-q => $q)); } @@ -1059,9 +1059,13 @@ lib: $(MODPERL_LIB) install: +# install mod_perl.so @$(MKPATH) $(MODPERL_AP_LIBEXECDIR) $(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \ $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR) +# install mod_perl .h files + @$(MKPATH) $(MODPERL_AP_INCLUDEDIR) + $(MODPERL_CP) $(MODPERL_H_FILES) $(MODPERL_AP_INCLUDEDIR) .SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s