Update plone3 skeleton master

diff --git a/Makefile.plone3-buildout b/Makefile.plone3-buildout
index e39ac20..b47cc7e 100644 (file)
--- a/Makefile.plone3-buildout
+++ b/Makefile.plone3-buildout
@@ -2,18 +2,13 @@
 
 buildout.cfg:
        $(PASTER) create --no-interactive -t plone3_buildout . zope_password=admin
-       @sed -i -e '/\[buildout\]/ba' -eb -e:a                  \
-           -ea\\ -e 'download-cache = $(DLCACHE)/downloads'    \
-           -ea\\ -e 'extends-cache = $(DLCACHE)/extends'       \
-                buildout.cfg || ( rm -f buildout.cfg; false )
-       @mkdir -p $(DLCACHE)/downloads $(DLCACHE)/extends || ( rm -f buildout.cfg; false )
 
 ###########################################################################
 
 eggs::
        @$(install) ZopeSkel
 
-buildout:: buildout.cfg
+buildout:: buildout.cfg buildout-net.cfg buildout-nonet.cfg
 
 .gitignore::
        @$(gitignore) "/var/"

diff --git a/skel-plone3/Makefile b/skel-plone3/Makefile
index 146d801..91941b7 100644 (file)
--- a/skel-plone3/Makefile
+++ b/skel-plone3/Makefile
@@ -5,11 +5,12 @@ PIL_VERSION    = 1.1.6
 
 ###########################################################################
 
-MAKELIB := $(shell for lib in plone-skeleton . ..; do [ ! -r "$$lib"/Makefile.master ] || break; done; echo "`cd $$lib; pwd`" )
+MAKELIB := $(shell for lib in zope-bootstrap . ..; do [ ! -r "$$lib"/Makefile.master ] || break; done; echo "`cd $$lib; pwd`" )
 
 include $(MAKELIB)/Makefile.master
 include $(MAKELIB)/Makefile.pybase
 include $(MAKELIB)/Makefile.pil
+include $(MAKELIB)/Makefile.buildout
 include $(MAKELIB)/Makefile.plone3-buildout
 
 localeggs.cfg:
@@ -53,3 +54,6 @@ newinstance: purgeinstance instance
 purgeinstance:
        rm -rf parts/instance var/filestorage
 .PHONY: purgeinstance
+
+clean::
+       rm -f localeggs.cfg server.cfg versions.cfg

diff --git a/skel-zope3/Makefile b/skel-zope3/Makefile
index 50b11d8..16d17b1 100644 (file)
--- a/skel-zope3/Makefile
+++ b/skel-zope3/Makefile
@@ -4,7 +4,7 @@ PROJECTNAME := appmain
 
 ###########################################################################
 
-MAKELIB := $(shell for lib in plone-skeleton . ..; do [ ! -r "$$lib"/Makefile.master ] || break; done; echo "`cd $$lib; pwd`")
+MAKELIB := $(shell for lib in zope-bootstrap . ..; do [ ! -r "$$lib"/Makefile.master ] || break; done; echo "`cd $$lib; pwd`")
 
 include $(MAKELIB)/Makefile.master
 include $(MAKELIB)/Makefile.pybase