heinous bootstrapping code

[p5sagit/local-lib.git] / lib / local / lib.pm

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 26f60ec..2b57eb0 100644 (file)
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -38,13 +38,13 @@ sub pipeline {
   }
 }
 
-=for test
+=for test pipeline
 
 package local::lib;
 
 { package Foo; sub foo { -$_[1] } sub bar { $_[1]+2 } sub baz { $_[1]+3 } }
 my $foo = bless({}, 'Foo');                                                 
-ok($foo->${pipeline qw(foo bar baz)}(10) == -15);
+Test::More::ok($foo->${pipeline qw(foo bar baz)}(10) == -15);
 
 =cut
 
@@ -135,6 +135,7 @@ sub setup_local_lib_for {
     exit 0;
   } else {
     $class->setup_env_hash_for($path);
+    unshift(@INC, split(':', $ENV{PERL5LIB}));
   }
 }
 
@@ -173,7 +174,7 @@ sub ensure_dir_structure_for {
     warn "Attempting to create file ${modulebuildrc_path}\n";
     open MODULEBUILDRC, '>', $modulebuildrc_path
       || Carp::croak("Couldn't open ${modulebuildrc_path} for writing: $!");
-    print MODULEBUILDRC qq{--install_base  ${path}\n}
+    print MODULEBUILDRC qq{install  --install_base  ${path}\n}
       || Carp::croak("Couldn't write line to ${modulebuildrc_path}: $!");
     close MODULEBUILDRC
       || Carp::croak("Couldn't close file ${modulebuildrc_path}: $@");
@@ -223,7 +224,7 @@ sub build_environment_vars_for {
 
 File::Path::rmtree('t/var/splat');
 
-$c->resolve_relative_path('t/var/splat');
+$c->ensure_dir_structure_for('t/var/splat');
 
 ok(-d 't/var/splat');