# HG changeset patch # User brenninc # Date 1460544131 14400 # Node ID 1eda5afe26d0e02222482dbf371804fe4c33d9e4 # Parent db02ab55306e9b6557a35a343904d27bb67a8c36 Uploaded diff -r db02ab55306e -r 1eda5afe26d0 tool_dependencies.xml --- a/tool_dependencies.xml Tue Apr 12 04:48:31 2016 -0400 +++ b/tool_dependencies.xml Wed Apr 13 06:42:11 2016 -0400 @@ -35,6 +35,9 @@ + + + @@ -91,9 +94,9 @@ sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R + $ENV[NCURSES_ROOT_PATH] $ENV[NCURSES_ROOT_PATH]/include $ENV[NCURSES_ROOT_PATH]/lib/ - $ENV[NCURSES_ROOT_PATH] $ENV[NCURSES_ROOT_PATH]/lib $ENV[NCURSES_ROOT_PATH]/lib $ENV[NCURSES_ROOT_PATH]/include @@ -101,12 +104,12 @@ $ENV[NCURSES_ROOT_PATH]/include/ncurses $ENV[NCURSES_ROOT_PATH]/include/ncurses + $ENV[READLINE_ROOT_PATH] $ENV[READLINE_ROOT_PATH]/include $ENV[READLINE_ROOT_PATH]/include $ENV[READLINE_ROOT_PATH]/include $ENV[READLINE_ROOT_PATH]/lib $ENV[READLINE_ROOT_PATH]/bin - $ENV[READLINE_ROOT_PATH] $ENV[READLINE_ROOT_PATH]/lib $ENV[READLINE_ROOT_PATH]/lib @@ -134,28 +137,27 @@ $ENV[LIBPNG_ROOT]/lib $ENV[LIBPNG_ROOT]/lib/pkgconfig - $ENV[PIXMAN_ROOT_PATH] - $ENV[PIXMAN_ROOT_PATH]/bin - $ENV[PIXMAN_ROOT_PATH]/lib - $ENV[PIXMAN_ROOT_PATH]/lib/pkgconfig + $ENV[PIXMAN_LIB_PATH] + $ENV[PIXMAN_LIB_PATH] + $ENV[PIXMAN_LIB_PATH]/pkgconfig - $ENV[LIBXML2_ROOT_PATH] - $ENV[LIBXML2_ROOT_PATH]/lib/pkgconfig - $ENV[LIBXML2_ROOT_PATH]/bin - $ENV[LIBXML2_ROOT_PATH]/lib - $ENV[LIBXML2_ROOT_PATH]/lib - $ENV[LIBXML2_ROOT_PATH]/lib - $ENV[LIBXML2_ROOT_PATH]/include - $ENV[LIBXML2_ROOT_PATH]/include + $ENV[LIBXML2_ROOT_DIR] + $ENV[LIBXML2_ROOT_DIR]/lib/pkgconfig + $ENV[LIBXML2_ROOT_DIR]/bin + $ENV[LIBXML2_ROOT_DIR]/lib + $ENV[LIBXML2_ROOT_DIR]/lib + $ENV[LIBXML2_ROOT_DIR]/lib + $ENV[LIBXML2_ROOT_DIR]/include + $ENV[LIBXML2_ROOT_DIR]/include - $ENV[FREETYPE_ROOT_PATH] - $ENV[FREETYPE_ROOT_PATH]/lib - $ENV[FREETYPE_ROOT_PATH]/bin - $ENV[FREETYPE_ROOT_PATH]/lib - $ENV[FREETYPE_ROOT_PATH]/lib - $ENV[FREETYPE_ROOT_PATH]/include - $ENV[FREETYPE_ROOT_PATH]/include - $ENV[FREETYPE_ROOT_PATH]/lib/pkgconfig + $ENV[FREETYPE_ROOT_DIR] + $ENV[FREETYPE_ROOT_DIR]/lib + $ENV[FREETYPE_ROOT_DIR]/bin + $ENV[FREETYPE_ROOT_DIR]/lib + $ENV[FREETYPE_ROOT_DIR]/lib + $ENV[FREETYPE_ROOT_DIR]/include + $ENV[FREETYPE_ROOT_DIR]/include + $ENV[FREETYPE_ROOT_DIR]/lib/pkgconfig $ENV[FONTCONFIG_ROOT_PATH] $ENV[FONTCONFIG_ROOT_PATH]/bin @@ -166,15 +168,15 @@ $ENV[FONTCONFIG_ROOT_PATH]/include/ $ENV[FONTCONFIG_ROOT_PATH]/include/ - $ENV[CAIRO_ROOT_PATH] - $ENV[CAIRO_ROOT_PATH]/bin - $ENV[CAIRO_ROOT_PATH]/lib - $ENV[CAIRO_ROOT_PATH]/include - $ENV[CAIRO_ROOT_PATH]/lib/pkgconfig - $ENV[CAIRO_ROOT_PATH]/lib - $ENV[CAIRO_ROOT_PATH]//include - -I$ENV[CAIRO_ROOT_PATH]/include/cairo - "-L$ENV[CAIRO_ROOT_PATH]/lib -lcairo" + $ENV[CAIRO_ROOT_DIR] + $ENV[CAIRO_ROOT_DIR]/bin + $ENV[CAIRO_ROOT_DIR]/lib + $ENV[CAIRO_ROOT_DIR]/include + $ENV[CAIRO_ROOT_DIR]/lib/pkgconfig + $ENV[CAIRO_ROOT_DIR]/lib + $ENV[CAIRO_ROOT_DIR]//include + -I$ENV[CAIRO_ROOT_DIR]/include/cairo + "-L$ENV[CAIRO_ROOT_DIR]/lib -lcairo" $INSTALL_DIR/lib/R/doc $INSTALL_DIR/lib/R