Previous changeset 3:ee307f3ce5dc (2015-10-09) Next changeset 5:8bce7b4c1d64 (2015-12-22) |
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/packages/package_freetype_2_5_2 commit be26d5871e25cedbc642669993e64439715c7a24 |
modified:
tool_dependencies.xml |
b |
diff -r ee307f3ce5dc -r 3b09e7916896 tool_dependencies.xml --- a/tool_dependencies.xml Fri Oct 09 08:13:16 2015 -0400 +++ b/tool_dependencies.xml Wed Nov 11 14:52:51 2015 -0500 |
b |
@@ -12,14 +12,14 @@ <package name="libpng" version="1.6.7" /> </repository> </action> - <action type="shell_command">export LDFLAGS="-Wl,-rpath,$LIBPNG_ROOT/lib" && ./configure --prefix=$INSTALL_DIR</action> - <action type="make_install" /> + <action type="autoconf" /> <action type="set_environment"> <environment_variable action="set_to" name="FREETYPE_LIB_PATH">$INSTALL_DIR/lib</environment_variable> <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable> - <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/freetype/lib</environment_variable> - <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/freetype/include</environment_variable> - <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/freetype/include</environment_variable> + <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable> + <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable> + <environment_variable action="prepend_to" name="C_INCLUDE_PATH">$INSTALL_DIR/include/freetype2</environment_variable> + <environment_variable action="prepend_to" name="CPLUS_INCLUDE_PATH">$INSTALL_DIR/include/freetype2</environment_variable> <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable> </action> </actions> |