# HG changeset patch
# User iuc
# Date 1421500687 18000
# Node ID 114b6af405fa841507fbe6163896ba5bce65a152
# Parent  28865aa39fbb353fd08b26d85811ce17613e999f
Uploaded

diff -r 28865aa39fbb -r 114b6af405fa tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Jun 06 18:35:30 2014 -0400
+++ b/tool_dependencies.xml	Sat Jan 17 08:18:07 2015 -0500
@@ -5,21 +5,22 @@
 
                 <!-- install perl -->
                 <action type="download_by_url">http://www.cpan.org/src/5.0/perl-5.18.1.tar.gz</action>
-                <action type="shell_command">./Configure -des -Dprefix=$INSTALL_DIR</action>
+                <action type="shell_command">./Configure -des -Dprefix=$INSTALL_DIR -Dstartperl='#!/usr/bin/env perl'</action>
                 <action type="make_install" />
                 <action type="change_directory">..</action>
                 <action type="download_file">http://www.cpan.org/authors/id/A/AP/APEIRON/local-lib-1.008009.tar.gz</action>
                 <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">export PATH=$INSTALL_DIR/bin/:$PATH; 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">export PATH=$INSTALL_DIR/bin/:$PATH; eval $(perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
                 <action type="change_directory">..</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="shell_command">sed -i 's|#!$INSTALL_DIR/bin/|#!/usr/bin/env |' $INSTALL_DIR/bin/*</action>
 
                 <action type="set_environment">
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
@@ -32,9 +33,9 @@
         <readme>
             Perl 5 is a highly capable, feature-rich programming language with over 25 years of development.
             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>