| Previous changeset 3:cf32ec1ccccd (2014-06-07) Next changeset 5:dd73404f61e4 (2014-07-19) |
|
Commit message:
Uploaded |
|
modified:
tool_dependencies.xml |
| b |
| diff -r cf32ec1ccccd -r cd979c60e4fb tool_dependencies.xml --- a/tool_dependencies.xml Sat Jun 07 15:19:55 2014 -0400 +++ b/tool_dependencies.xml Wed Jul 16 20:26:32 2014 -0400 |
| b |
| @@ -12,14 +12,13 @@ <install version="1.0"> <actions> <action type="download_by_url">http://curl.haxx.se/download/curl-7.36.0.tar.gz</action> - <action type="shell_command">make</action> - <action type="move_directory_files"> - <source_directory>include</source_directory> - <destination_directory>$INSTALL_DIR</destination_directory> - </action> + <action type="shell_command">mkdir install-destination</action> + <action type="shell_command">./configure --with-ssl --prefix=/home/saket/Desktop/curl-7.36.0/install-destination</action> + <action type="shell_command">make all</action> + <action type="shell_command">make install</action> <action type="set_environment"> - <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR</environment_variable> - <environment_variable name="CURL" action="set_to">$INSTALL_DIR</environment_variable> + <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/install-destination</environment_variable> + <environment_variable name="CURL" action="set_to">$INSTALL_DIR/install-destination/bin/curl-config</environment_variable> </action> </actions> @@ -29,7 +28,7 @@ <action type="make_directory">$INSTALL_DIR/lib/python</action> <action type="shell_command"> export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python && - python setup.py build --with-ssl --curl-config=$CURL/curl-config && + python setup.py build --with-ssl --curl-config=$CURL && python setup.py install --install-lib $INSTALL_DIR/lib/python </action> <action type="set_environment"> |