Return-Path: Delivered-To: apmail-httpd-test-cvs-archive@www.apache.org Received: (qmail 30637 invoked from network); 18 Feb 2004 20:24:45 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 18 Feb 2004 20:24:45 -0000 Received: (qmail 93407 invoked by uid 500); 18 Feb 2004 20:24:35 -0000 Delivered-To: apmail-httpd-test-cvs-archive@httpd.apache.org Received: (qmail 93375 invoked by uid 500); 18 Feb 2004 20:24:34 -0000 Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: test-dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list test-cvs@httpd.apache.org Received: (qmail 93325 invoked from network); 18 Feb 2004 20:24:34 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 18 Feb 2004 20:24:34 -0000 Received: (qmail 30523 invoked by uid 1072); 18 Feb 2004 20:24:44 -0000 Date: 18 Feb 2004 20:24:44 -0000 Message-ID: <20040218202444.30522.qmail@minotaur.apache.org> From: stas@apache.org To: httpd-test-cvs@apache.org Subject: cvs commit: httpd-test/perl-framework/Apache-Test Makefile.PL Changes X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stas 2004/02/18 12:24:44 Modified: perl-framework/Apache-Test Makefile.PL Changes Log: Make sure that Apache-Test modules are installed into INSTALLSITEARCH during a standalone build. Because EU::MM does so when A-T is bundled with mp2, and we want to avoid having A-T installed in two different places under @INC. Revision Changes Path 1.19 +22 -2 httpd-test/perl-framework/Apache-Test/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v retrieving revision 1.18 retrieving revision 1.19 diff -u -u -r1.18 -r1.19 --- Makefile.PL 18 Jan 2004 03:17:16 -0000 1.18 +++ Makefile.PL 18 Feb 2004 20:24:44 -0000 1.19 @@ -6,8 +6,8 @@ use strict; use warnings; -# is this file was invoked directly via perl, or via the top-level -# Makefile.PL, top-level sets this env var +# was this file invoked directly via perl, or via the top-level +# (mp2) Makefile.PL? if top-level, this env var will be set use constant TOP_LEVEL => !exists $ENV{MOD_PERL_2_BUILD}; use ExtUtils::MakeMaker; @@ -76,6 +76,26 @@ return $string; } +sub MY::constants { + my $self = shift; + + my $string = $self->MM::constants; + + # mp2 installs A-T into INSTALLSITEARCH, so in order to avoid + # problems when users forget 'make install UNINST=1', trick MM into + # installing pure perl modules to the sitearch location, when A-T is + # not installed as a part of mp2 build + if (TOP_LEVEL) { + $string .= <<'EOI'; + +# install into the same location as mod_perl 2.0 +INSTALLSITELIB = $(INSTALLSITEARCH) +DESTINSTALLSITELIB = $(DESTINSTALLSITEARCH) +EOI + } + + $string; +} sub add_dep { my($string, $targ, $add) = @_; 1.90 +5 -0 httpd-test/perl-framework/Apache-Test/Changes Index: Changes =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v retrieving revision 1.89 retrieving revision 1.90 diff -u -u -r1.89 -r1.90 --- Changes 18 Feb 2004 16:33:09 -0000 1.89 +++ Changes 18 Feb 2004 20:24:44 -0000 1.90 @@ -8,6 +8,11 @@ =item 1.08_dev +Make sure that Apache-Test modules are installed into INSTALLSITEARCH +during a standalone build. Because EU::MM does so when A-T is bundled +with mp2, and we want to avoid having A-T installed in two different +places under @INC. [Stas] + HTTP/0.9 responses no longer croak, provided $ENV{APACHE_TEST_HTTP_09_OK} is true. [Geoffrey Young]