# HG changeset patch
# User iuc
# Date 1406992320 14400
# Node ID a1a111b9faa53dba2ff477794fe1f436f50b5d8d
# Parent  e89824189ec64cc54543534dc1276e949c5d1606
Uploaded

diff -r e89824189ec6 -r a1a111b9faa5 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Jun 09 09:02:18 2014 -0400
+++ b/tool_dependencies.xml	Sat Aug 02 11:12:00 2014 -0400
@@ -5,36 +5,28 @@
 
                 <!-- 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 --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 $(perl -I$INSTALL_DIR/lib/perl5 -Mlocal::lib=$INSTALL_DIR)</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="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>
+                <action type="shell_command">sed -i 's|#!$INSTALL_DIR/bin/|#!/usr/bin/env |' $INSTALL_DIR/bin/*</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>