cvs commit: httpd-apreq Makefile.PL

[joes]

joes        2002/12/23 20:16:58

  Modified:    .        Makefile.PL
  Log:
  David Wheeler's FindBin patch. Fixes relative pathing problems for our 
Apache::test suite.
  
  Revision  Changes    Path
  1.16      +6 -2      httpd-apreq/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Makefile.PL,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.PL       8 Dec 2002 05:25:50 -0000       1.15
  +++ Makefile.PL       24 Dec 2002 04:16:58 -0000      1.16
  @@ -1,9 +1,13 @@
   use ExtUtils::MakeMaker;
   use strict;
  +use FindBin;
   use 5.005;
   
   my $Is_Win32 = ($^O eq "MSWin32") || $ENV{WIN32_TEST};
   
  +my $conf_data = join '', <DATA>;
  +$conf_data =~ s/(blib\/arch)/$FindBin::Bin\/$1/;
  +
   if (not $Is_Win32) {
     eval {
       require Apache::test;
  @@ -12,7 +16,7 @@
       my %params = Apache::test->get_test_params();
       alarm 0;
       
  -    Apache::test->write_httpd_conf(%params, include => join '', <DATA>);
  +    Apache::test->write_httpd_conf(%params, include => $conf_data);
       *MY::test = sub {Apache::test->MM_test(%params)};
     };
     print "\n[timeout] skipping test setup...\n" if $@ eq "alarm\n";
  @@ -156,7 +160,7 @@
       print CONF $_;
     }
     close ORIG;
  -  print CONF $_ while (<DATA>);
  +  print CONF $conf_data;
     close CONF;
     *MY::test = sub {
   return << 'EOF';