From 7cdfb26d6f4443b7b2c492bdb87be9f11fba9e52 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 12 Nov 2010 09:17:41 +0000
Subject: [PATCH] use hexagonit.recipe.cmmi instead of
 erp5.recipe.softwarebuild, because erp5.recipe.softwarebuild depends on
 zc.recipe.cmmi that conflicts with zc.buildout >= 1.5.0b1.

# we were using erp5.recipe.softwarebuild only in haproxy.cfg, so I do not fix erp5.recipe.softwarebuild. but if we still want to use erp5.recipe.softwarebuild, we need to rewrite it so as not to use zc.recipe.cmmi.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40226 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/software-profiles/haproxy.cfg | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/buildout/software-profiles/haproxy.cfg b/buildout/software-profiles/haproxy.cfg
index e1a5910bc3..681a461717 100644
--- a/buildout/software-profiles/haproxy.cfg
+++ b/buildout/software-profiles/haproxy.cfg
@@ -2,14 +2,13 @@
 parts = haproxy
 
 [haproxy]
-recipe = erp5.recipe.softwarebuild
+recipe = hexagonit.recipe.cmmi
 url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.9.tar.gz
 md5sum = 2cbcc95b54c0d803edaa13e7b4aeec25
-source-directory-contains = Makefile
-run-configure = false
+configure-command = true
 # XXX-Luke: autodetection shall be provided by erp5.recipe.softwarebuild
 #           with possible overriding customisation
 # linux26 might be better target, but on this level portability is a must
-make-options = TARGET=generic
-make-install-options = ${:make-options}
-make-install-destination-parameter = PREFIX=
+make-options =
+  TARGET=generic
+  PREFIX=${buildout:parts-directory}/haproxy
-- 
2.30.9