From c0e01f700983c54cc80fb3738e6559cbbc29f745 Mon Sep 17 00:00:00 2001
From: Bernhard Schmalhofer <Bernhard.Schmalhofer@gmx.de>
Date: Sun, 8 Mar 2009 12:52:42 +0100
Subject: [PATCH] Remember the exe 'parrot_config' used in Configure.pl and use
 it in Pipp::Test::read_parrot_config().

---
 Configure.pl                              | 8 ++++----
 build/templates/lib/Pipp/FindParrot_pm.in | 8 +++++++-
 lib/Pipp/Test.pm                          | 6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Configure.pl b/Configure.pl
index 56e32cb..4e301aa 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -68,7 +68,7 @@ END
 }
 
 #  Create the Makefile using the information we just got
-create_makefiles(
+create_files(
     \%config,
     { 'build/templates/Makefile.in'                => 'Makefile',
       'build/templates/src/pmc/Makefile.in'        => 'src/pmc/Makefile',
@@ -116,10 +116,10 @@ sub read_parrot_config {
 
 
 #  Generate a Makefile from a configuration
-sub create_makefiles {
-    my ($config, $makefiles) = @_;
+sub create_files {
+    my ($config, $setup) = @_;
 
-    while (my ($template_fn, $target_fn) = each %{$makefiles}) {
+    while (my ($template_fn, $target_fn) = each %{$setup}) {
         my $content;
         {
             open my $template_fh, '<', $template_fn or
diff --git a/build/templates/lib/Pipp/FindParrot_pm.in b/build/templates/lib/Pipp/FindParrot_pm.in
index 7b41e41..a751ec5 100644
--- a/build/templates/lib/Pipp/FindParrot_pm.in
+++ b/build/templates/lib/Pipp/FindParrot_pm.in
@@ -1,3 +1,9 @@
-use lib '/home/bernhard/devel/Parrot/install/lib/parrot/0.9.1-devel/tools/lib';
+# Set up @INC, so that the Parrot::* modules of an installed Parrot is found
+
+use lib '@lib_dir@@versiondir@/tools/lib';
+
+package Pipp::FindParrot;
+
+our $parrot_config = '@bin_dir@/parrot_config';
 
 1;
diff --git a/lib/Pipp/Test.pm b/lib/Pipp/Test.pm
index 11ade4c..3a4155b 100644
--- a/lib/Pipp/Test.pm
+++ b/lib/Pipp/Test.pm
@@ -109,13 +109,12 @@ package Pipp::Test;
 
 use strict;
 use warnings;
+use lib qw( lib );
 
 use Cwd;
 use File::Spec;
-use File::Basename;
-use Memoize ();
 
-use lib qw( lib );
+use Pipp::FindParrot;
 
 require Exporter;
 require Test::Builder;
@@ -388,6 +387,7 @@ sub _prepare_exit_message {
 
 sub read_parrot_config {
      my @parrot_config_exe = (
+         $Pipp::FindParrot::parrot_config,
          'parrot/parrot_config', 
          '../../parrot_config',
          'parrot_config'