cvs commit: modperl Makefile.PL

[randyk]

randyk      2003/07/08 18:16:53

  Modified:    .        Makefile.PL
  Log:
  For Win32,
  - copy mod_perl.lib into Apache/libexec directory, if it exists
  - keep drive letter in dsp (fixes bug reported by DH <[EMAIL PROTECTED]>)
  
  Revision  Changes    Path
  1.215     +7 -2      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.214
  retrieving revision 1.215
  diff -u -r1.214 -r1.215
  --- Makefile.PL       2 Jul 2003 15:57:53 -0000       1.214
  +++ Makefile.PL       9 Jul 2003 01:16:52 -0000       1.215
  @@ -370,7 +370,7 @@
       (-d "$fixed_apsrc/src/include" ? $fixed_apsrc . '/src' :
        die "Cannot find the Apache include directory under $fixed_apsrc");
     $win32_auto = 1;
  -  if (not defined $win32_args{INSTALL_DLL}) {
  +  unless ($win32_args{INSTALL_DLL}) {
       my $w32_ap_mod = $fixed_apsrc . '/modules';
       $win32_args{INSTALL_DLL} = $w32_ap_mod if -d $w32_ap_mod;
     }
  @@ -1371,6 +1371,12 @@
        $win32_args{INSTALL_DLL} .
          ($win32_args{APACHE_VERS} < 1315 ?
           '/ApacheModulePerl.dll' : '/mod_perl.so');
  +        if (-d "$win32_args{APACHE_SRC}/libexec") {
  +          my $libexec = win32_fix_path($win32_args{APACHE_SRC}) . '/libexec';
  +          $string .= sprintf qq{\n\t\$(CP) "%s" "%s"}, 
  +            "$win32_path{MODPERL_LIB}/mod_perl.lib", 
  +              $libexec . '/mod_perl.lib';
  +        }
         }
         return $string;
       }
  @@ -2236,7 +2242,6 @@
   sub win32_fix_path_dsp {
     local $_ = shift;
     tr!/!\\!;
  -  s!^\w:!!;
     return $_;
   }