From: Tomas Doran <bobtfish@bobtfish.net>
Date: Thu, 20 Jan 2011 01:04:44 +0000 (+0000)
Subject: Fix the test in dist build
X-Git-Tag: 1.31~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Devel.git;a=commitdiff_plain;h=636c7d946d756a64fa6fc7ac2bc4e112f1131471

Fix the test in dist build
---

diff --git a/t/generated_app.t b/t/generated_app.t
index a02ccaa..b3a0998 100644
--- a/t/generated_app.t
+++ b/t/generated_app.t
@@ -19,7 +19,13 @@ plan skip_all => "No share dir at $share_dir!"
 
 $ENV{CATALYST_DEVEL_SHAREDIR} = $share_dir;
 my $instdir = tempdir(CLEANUP => 1);
+
 $ENV{PERL_MM_OPT} = "INSTALL_BASE=$instdir";
+$ENV{INSTALL_BASE} = $instdir;
+if ($ENV{MAKEFLAGS}) {
+    $ENV{MAKEFLAGS} =~ s/PREFIX=[^\s]+//;
+    $ENV{MAKEFLAGS} =~ s/INSTALL_BASE=[^\s]+//;
+}
 
 my $dir = tempdir(CLEANUP => 1);
 my $devnull = File::Spec->devnull;