[Erp5-report] r40226 kazuhiko - /erp5/trunk/buildout/software-profiles/haproxy.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Nov 12 10:17:41 2010
New Revision: 40226

URL: http://svn.erp5.org?rev=40226&view=rev
Log:
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.

Modified:
    erp5/trunk/buildout/software-profiles/haproxy.cfg

Modified: erp5/trunk/buildout/software-profiles/haproxy.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/haproxy.cfg?rev=40226&r1=40225&r2=40226&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/haproxy.cfg [utf8] Fri Nov 12 10:17:41 2010
@@ -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