perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/lib/Apache Build.pm
Date Sun, 26 Sep 2004 07:06:23 GMT
gozer       2004/09/26 00:06:23

  Modified:    .        Changes Makefile.PL
               lib/Apache Build.pm
  Log:
  make install and static build now correctly installs mod_perl as
  well as the statically built apache
  Reported by: <pratiknaik@gmail.com>
  
  Revision  Changes    Path
  1.501     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.500
  retrieving revision 1.501
  diff -u -r1.500 -r1.501
  --- Changes	26 Sep 2004 03:12:38 -0000	1.500
  +++ Changes	26 Sep 2004 07:06:23 -0000	1.501
  @@ -12,6 +12,9 @@
   
   =item 1.99_17-dev
   
  +make install and static build now correctly installs mod_perl as
  +well as the statically built apache [Gozer]
  +
   if some code changes the current interpreter's tainted state to on,
   the return value from the handler callback will be tainted, and we
   fail to deal with that. So revert to coercing any return value, but
  
  
  
  1.163     +9 -1      modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.162
  retrieving revision 1.163
  diff -u -r1.162 -r1.163
  --- Makefile.PL	25 Sep 2004 01:53:34 -0000	1.162
  +++ Makefile.PL	26 Sep 2004 07:06:23 -0000	1.163
  @@ -559,7 +559,13 @@
   
       if ($build->should_build_apache) {
           ModPerl::MM::add_dep(\$string, pure_all => 'ap_build');
  -        $string .= qq[\nap_build: modperl_lib\n\tcd "$build->{MP_AP_PREFIX}" &&
make\n];
  +        $string .= <<"EOF";
  +ap_build: modperl_lib
  +	cd "$build->{MP_AP_PREFIX}" && make
  +    
  +ap_install: ap_build
  +	cd "$build->{MP_AP_PREFIX}" && make install
  +EOF
       }
       
       ModPerl::MM::add_dep(\$string, pure_all => 'modperl_lib');
  @@ -627,6 +633,8 @@
   sub MY::install {
       my $self = shift;
       my $string = $self->MM::install(@_);
  +    ModPerl::MM::add_dep(\$string, pure_install => 'ap_install') 
  +        if $build->should_build_apache;
       ModPerl::MM::add_dep(\$string, pure_install => 'modperl_lib_install');
       ModPerl::MM::add_dep(\$string, pure_install => 'modperl_xs_h_install');
       # ModPerl::MM::add_dep(\$string, pure_install => 'aprext_install')
  
  
  
  1.186     +7 -0      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.185
  retrieving revision 1.186
  diff -u -r1.185 -r1.186
  --- Build.pm	22 Sep 2004 23:10:48 -0000	1.185
  +++ Build.pm	26 Sep 2004 07:06:23 -0000	1.186
  @@ -1495,10 +1495,17 @@
   
       my $install = <<'EOI';
   install:
  +EOI
  +    if (!$self->should_build_apache) {
  +        $install .= <<'EOI';
   # install mod_perl.so
   	@$(MKPATH) $(MODPERL_AP_LIBEXECDIR)
   	$(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \
   	$(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
  +EOI
  +    }
  +    
  +    $install .= <<'EOI';
   # install mod_perl .h files
   	@$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
   	$(MODPERL_CP) $(MODPERL_H_FILES) $(MODPERL_AP_INCLUDEDIR)
  
  
  

Mime
View raw message