# HG changeset patch
# User iuc
# Date 1395404614 14400
# Node ID 8ee4936dfce35f7e8811ae6f0a037d9e53b04449
# Parent  ab58b9f990c5a0a56ee23bcf58cad72484570b16
Uploaded

diff -r ab58b9f990c5 -r 8ee4936dfce3 tool_dependencies.xml
--- a/tool_dependencies.xml	Tue Nov 05 18:14:53 2013 -0500
+++ b/tool_dependencies.xml	Fri Mar 21 08:23:34 2014 -0400
@@ -14,18 +14,26 @@
                 <!-- 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">make install</action>
-                <action type="shell_command">eval $($INSTALL_DIR/bin/perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
+                <action type="shell_command">eval $(perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
 
                 <!-- install cpanminus into our new perl environment -->
                 <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>
 
+                <!--
+                <action type="chmod">
+                    <file mode="750">cpanm</file>
+                </action>
+                <action type="move_file">
+                    <source>cpanm</source>
+                    <destination>$INSTALL_DIR/bin/</destination>
+                </action>
+                -->
                 <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="PERL_ROOT_DIR" action="set_to">$INSTALL_DIR</environment_variable>
-                    <environment_variable name="PERL_LOCALLIB_DIR" action="set_to">$INSTALL_DIR/local-lib</environment_variable>
                 </action>
             </actions>
         </install>
@@ -34,7 +42,7 @@
             http://www.perl.org/
             
             This repository contains local-lib and cpanm in addition.
-            It is recommended to use something like "cpanm --local-lib=$PERL_LOCALLIB_DIR XML::Parser" to install additional perl modules.
+            It is recommended to use something like "cpanm --local-lib=$PERL_ROOT_DIR XML::Parser" to install additional perl modules.
         </readme>
     </package>
 </tool_dependency>