From 5001eb0e7a1e255a248cd938f8895984daa85ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Fri, 12 Feb 2010 09:59:39 +0000
Subject: [PATCH]  - reuse software_definition part to find software

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32484 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/mysql-instance/buildout.cfg | 4 ++--
 buildout/python-2.4/buildout.cfg     | 2 +-
 buildout/zope-instance/buildout.cfg  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/mysql-instance/buildout.cfg
index 7b7266e3de..4b4334bd06 100644
--- a/buildout/mysql-instance/buildout.cfg
+++ b/buildout/mysql-instance/buildout.cfg
@@ -40,11 +40,11 @@ output = ${configuration:mysql_cnf_file}
 recipe = plone.recipe.command
 command =
     mkdir -p ${configuration:mysql_datadir}
-    ${buildout:bin-directory}/mysql_install_db --datadir=${configuration:mysql_datadir}
+    ${software_definition:software_home}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
 
 [start-mysql-instance]
 recipe = plone.recipe.command
-command = ${buildout:bin-directory}/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} &
+command = ${software_definition:software_home}/bin/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} &
 update-command = ${:command}
 
 [stop-mysql-instance]
diff --git a/buildout/python-2.4/buildout.cfg b/buildout/python-2.4/buildout.cfg
index fc08171bc4..9566a2fdef 100644
--- a/buildout/python-2.4/buildout.cfg
+++ b/buildout/python-2.4/buildout.cfg
@@ -26,7 +26,7 @@ executable = ${:prefix}/bin/python${buildout:python_version}
 
 [pythonbin]
 recipe = plone.recipe.command
-command = ln -sf ${python:executable} ${buildout:bin-directory}/python${buildout:python_version}
+command = ln -sf ${python:executable} ${software_definition:software_home}/bin/python${buildout:python_version}
 
 [requirements]
 binary =
diff --git a/buildout/zope-instance/buildout.cfg b/buildout/zope-instance/buildout.cfg
index e8a185f4d3..ddf93f4c82 100644
--- a/buildout/zope-instance/buildout.cfg
+++ b/buildout/zope-instance/buildout.cfg
@@ -40,7 +40,7 @@ products =
 # XXX: This have to be converted into recipe
 recipe = plone.recipe.command
 command =
-  echo "CREATE DATABASE IF NOT EXISTS ${create_erp5_site:mysql_database_name} DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci" | ${buildout:bin-directory}/mysql --defaults-file=${configuration:mysql_cnf_file} -u root
+  echo "CREATE DATABASE IF NOT EXISTS ${create_erp5_site:mysql_database_name} DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci" | ${software_definition:software_home}/bin/mysql --defaults-file=${configuration:mysql_cnf_file} -u root
 
 [create_erp5_site]
 depends = ${create_mysql_database:command}
-- 
2.30.9