diff --git a/buildout/hooks/mysql-tritonn-hooks.py b/buildout/hooks/mysql-tritonn-hooks.py index 8c1827bd1466454c9f502269d16f694484c408a7..07f8690f2bcbb08818e9e2f97bf98209b94d0be7 100644 --- a/buildout/hooks/mysql-tritonn-hooks.py +++ b/buildout/hooks/mysql-tritonn-hooks.py @@ -6,9 +6,9 @@ import os CMDS = """ cd %s/* libtoolize -c -f -aclocal-1.9 +which aclocal-1.9 >/dev/null 2>/dev/null && aclocal-1.9 || aclocal autoheader -automake-1.9 -c -a -i +which automake-1.9 >/dev/null 2>/dev/null && automake-1.9 -c -a -i || automake -c -a -i autoconf touch sql/sql_yacc.yy """.strip() diff --git a/buildout/software-profiles/mysql-tritonn-5.0.cfg b/buildout/software-profiles/mysql-tritonn-5.0.cfg index bb10486de3cd04e6ad475c13b4d1b82a50c4dc7e..121355e012abf030550d1d279389df226f28d3e8 100644 --- a/buildout/software-profiles/mysql-tritonn-5.0.cfg +++ b/buildout/software-profiles/mysql-tritonn-5.0.cfg @@ -42,11 +42,10 @@ configure-options = patch-options = -p1 patches = ${mysql-5.0-tritonn-patch:location}/${mysql-5.0-tritonn-patch:filename} environment = - PATH =${senna:location}/bin:${automake-1.9:location}/bin:%(PATH)s + PATH =${senna:location}/bin:%(PATH)s CFLAGS =-I${senna:location}/include/senna CXXFLAGS =-I${senna:location}/include/senna LDFLAGS =-L${senna:location}/lib - LIBTOOL =${libtool:location}/bin/libtool [requirements] binary = automake flex bison patch gcc g++ libtool