Move generic buildout stuff into Makefile.buildout

[zope-bootstrap.git] / Makefile.zope3-buildout

diff --git a/Makefile.zope3-buildout b/Makefile.zope3-buildout
index 6bb86c8..510ff66 100644 (file)
--- a/Makefile.zope3-buildout
+++ b/Makefile.zope3-buildout
@@ -16,21 +16,6 @@ buildout.cfg:
        ) || ( rm -rf temp-project; false )
        @echo
        @(rm -rf $(BASEDIR)/temp-project)
-       @sed -i -e '/\[buildout\]/ba' -eb -e:a                  \
-           -ea\\ -e 'download-cache = $(DLCACHE)/downloads'    \
-           -ea\\ -e 'install-from-cache = true'                \
-           -ea\\ -e 'extends-cache = $(DLCACHE)/extends'       \
-                buildout.cfg || ( rm -f buildout.cfg; false )
-       @mkdir -p $(DLCACHE)/downloads $(DLCACHE)/extends || ( rm -f buildout.cfg; false )
-
-buildout-net.cfg:
-       @(                                      \
-           echo "[buildout]";                  \
-           echo "extends = buildout.cfg";      \
-           echo "install-from-cache = false";  \
-           echo "newest = true";               \
-       ) >  buildout-net.cfg
-
 
 ###########################################################################
 
@@ -57,18 +42,14 @@ bootstrap::
 .gitignore::
        @$(gitignore) "/bin/"
        @$(gitignore) "/develop-eggs/"
-       @$(gitignore) "/downloads/"
+       @$(gitignore) "/$(EGGDIR)/"
        @$(gitignore) "/log/"
        @$(gitignore) "/var/"
+       @$(gitignore) "/parts/"
        @$(gitignore) "/.installed.cfg"
 
 .env::
        @$(env) PATH $(BASEDIR)/bin
 
 clean::
-       rm -rf log var develop-eggs parts
-
-BUILDOUT_OPTS = -c buildout-net.cfg
-
-init-nonet: BUILDOUT_OPTS =
-update-nonet: BUILDOUT_OPTS =
+       rm -rf bin $(EGGDIR) log var develop-eggs parts .installed.cfg