# HG changeset patch
# User bgruening
# Date 1402318938 14400
# Node ID e89824189ec64cc54543534dc1276e949c5d1606
# Parent  3e8130c7fb18a47c238f27054e8f5469ebcc5f83
Uploaded

diff -r 3e8130c7fb18 -r e89824189ec6 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Jun 09 08:21:13 2014 -0400
+++ b/tool_dependencies.xml	Mon Jun 09 09:02:18 2014 -0400
@@ -12,11 +12,12 @@
                 <action type="shell_command">tar xfvz local-lib-1.008009.tar.gz</action>
                 <action type="change_directory">local-lib-1.008009</action>
                 <!-- TODO: Here we need to use the new installed perl binary -->
-                <action type="shell_command">$INSTALL_DIR/bin/perl Makefile.PL --bootstrap=$INSTALL_DIR/local-lib/ --no-manpages</action>
+                <action type="shell_command">$INSTALL_DIR/bin/perl Makefile.PL --bootstrap=$INSTALL_DIR --no-manpages</action>
                 <action type="shell_command">make install</action>
-                <action type="shell_command">eval $(perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
+                <action type="shell_command">eval $(perl -I$INSTALL_DIR/lib/perl5 -Mlocal::lib=$INSTALL_DIR)</action>
 
                 <!-- install cpanminus into our new perl environment -->
+                <action type="change_directory">..</action>
                 <action type="download_file">https://raw.github.com/miyagawa/cpanminus/c0c88f71118ecec334d62ba280e883933e7a6d39/cpanm</action>
                 <!-- prepanding means that the new install perl binary will be used after the pipe -->
                 <action type="shell_command">export PERL5LIB=$INSTALL_DIR/lib/perl5/:$PERL5LIB ; export PATH=$INSTALL_DIR/bin/:$PATH ; cat cpanm | perl - App::cpanminus</action>
@@ -33,7 +34,6 @@
                 <action type="set_environment">
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable name="PERL5LIB" action="prepend_to">$INSTALL_DIR/lib/perl5</environment_variable>
-                    <environment_variable name="PERL5LIB" action="prepend_to">$INSTALL_DIR/local-lib/perl5</environment_variable>
                     <environment_variable name="PERL_ROOT_DIR" action="set_to">$INSTALL_DIR</environment_variable>
                 </action>
             </actions>