Ensure that DESTDIR is respected

tadzik · Jul 11, 2012 · c37cd2c · c37cd2c
1 parent c77524e
commit c37cd2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bin/panda b/bin/panda
@@ -69,7 +69,7 @@ my $panda;
 
     $panda = Panda.new(
         srcdir       => "$pandadir/src",
-        destdir      => "$home/.perl6",
+        destdir      => "{cwd}/%*ENV<DESTDIR>" // "$home/.perl6",
         statefile    => "$pandadir/state",
         projectsfile => "$pandadir/projects.json"
     );

diff --git a/bootstrap.pl b/bootstrap.pl
@@ -11,11 +11,15 @@
     .close;
 }
 
+if %*ENV<DESTDIR> {
+    %*ENV<PERL6LIB> ~= ":{cwd}/{%*ENV<DESTDIR>}/lib"
+}
+
 %*ENV<PERL6LIB> ~= ":{cwd}/ext/File__Tools/lib";
 %*ENV<PERL6LIB> ~= ":{cwd}/ext/JSON__Tiny/lib";
 %*ENV<PERL6LIB> ~= ":{cwd}/ext/Test__Mock/lib";
 %*ENV<PERL6LIB> ~= ":{cwd}/lib";
-shell "perl6 bin/panda install File::Tools JSON::Tiny Test::Mock";
-shell "perl6 bin/panda install .";
+
+shell "perl6 bin/panda install File::Tools JSON::Tiny Test::Mock .";
 
 unlink "$home/.panda/projects.json";