perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/lib/Apache Build.pm
Date Fri, 02 Nov 2001 17:59:05 GMT
dougm       01/11/02 09:59:05

  Modified:    .        Makefile.PL
               lib/Apache Build.pm
  Log:
  change install method for libmodperl.so: now done via src/modules/perl/Makefile
  install target
  
  Revision  Changes    Path
  1.53      +10 -11    modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Makefile.PL	2001/11/02 17:33:46	1.52
  +++ Makefile.PL	2001/11/02 17:59:05	1.53
  @@ -291,6 +291,9 @@
   modperl_lib:
   	cd "$(MODPERL_SRC)" && $(MAKE)
   
  +modperl_lib_install:
  +	cd "$(MODPERL_SRC)" && $(MAKE) install
  +
   modperl_src_clean:
   	cd "$(MODPERL_SRC)" && $(MAKE) clean
   
  @@ -299,6 +302,13 @@
       $string;
   }
   
  +sub MY::install {
  +    my $self = shift;
  +    my $string = $self->MM::install(@_);
  +    ModPerl::MM::add_dep(\$string, pure_install => 'modperl_lib_install');
  +    $string;
  +}
  +
   sub MY::clean {
       my $self = shift;
       my $string = $self->MM::clean(@_);
  @@ -317,17 +327,6 @@
   
   sub MY::post_initialize {
       my $self = shift;
  -
  -    #XXX: MakeMaker will try to unlink $(APACHE_LIBDIR)/$MODPERL_LIB
  -    #during 'make' and probably 'make clean' as well
  -    #need to find another way to install libmodperl.so
  -
  -    # install libmodperl.so
  -#    if ($build->{MP_USE_DSO}) {
  -#        my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, 'so';
  -#        $self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
  -#            "\$(APACHE_LIBDIR)/$MODPERL_LIB";
  -#    }
   
       #up one from the Apache2/ subdir
       #so it can be found for 'use Apache2 ()'
  
  
  
  1.72      +10 -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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- Build.pm	2001/11/02 17:23:54	1.71
  +++ Build.pm	2001/11/02 17:59:05	1.72
  @@ -738,7 +738,7 @@
       my $mm = bless {}, 'MM';
       $mm->init_others;
   
  -    for (qw(rm_f mv ld ar)) {
  +    for (qw(rm_f mv ld ar cp test_f)) {
           my $val = $mm->{"\U$_"};
           if ($val) {
               mm_replace(\$val);
  @@ -858,6 +858,11 @@
                                        $self->{MODPERL_LIB_SHARED} :
                                        $self->{MODPERL_LIB_STATIC});
   
  +    for my $q (qw(LIBEXECDIR)) {
  +        print $fh $self->canon_make_attr("AP_$q",
  +                                         $self->apxs(-q => $q));
  +    }
  +
       my $xs_targ = $self->make_xs($fh);
   
       print $fh <<'EOF';
  @@ -872,6 +877,10 @@
   all: lib
   
   lib: $(MODPERL_LIB)
  +
  +install:
  +	$(MODPERL_TEST_F) $(MODPERL_LIB_SHARED) && \
  +	$(MODPERL_CP) $(MODPERL_LIB_SHARED) $(MODPERL_AP_LIBEXECDIR)
   
   .SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
   
  
  
  

Mime
View raw message