Target cleanup and extended help system

[zope-bootstrap.git] / Makefile.pybase

diff --git a/Makefile.pybase b/Makefile.pybase
index 6a7a0b5..325c39d 100644 (file)
--- a/Makefile.pybase
+++ b/Makefile.pybase
@@ -3,11 +3,10 @@
 PYTHON_VERSION  ?= 2.4.6
 PYTHON_URL      ?= http://www.python.org/ftp/python/$(PYTHON_VERSION)/Python-$(PYTHON_VERSION).tgz
 SETUPTOOLS_URL  ?= http://peak.telecommunity.com/dist/ez_setup.py
+PYTHON_DIR      ?= python
 
 ###########################################################################
 
-PYTHON_DIR ?= python
-
 PYTHON       = $(BASEDIR)/$(PYTHON_DIR)/bin/python
 EASY_INSTALL = $(BASEDIR)/$(PYTHON_DIR)/bin/easy_install
 PIP          = $(BASEDIR)/$(PYTHON_DIR)/bin/pip
@@ -125,7 +124,8 @@ eggs::
        @$(install) zc.buildout
 
 .gitignore::
-       @$(gitignore) /python/
+       @$(gitignore) "*.pyc"
+       @$(gitignore) "/python/"
 
 .env::
        @$(env) PATH $(BASEDIR)/$(PYTHON_DIR)/bin
@@ -139,8 +139,23 @@ PIP_CACHE_FILES := $(shell cd $(DLCACHE)/pip; ls *.tar.gz | grep -vF '%2F')
 
 init-nonet: PIP_OPTS  = --no-index $(patsubst %,--find-link=file://$(BASEDIR)/$(DLCACHE)/pip/%,$(PIP_CACHE_FILES))
 
-help::
+fullhelp::
        @echo "    python-rebuild"
        @echo "        recompile python from source. This may be needed after"
        @echo "        upgrading the host distribution."
-       @echo
\ No newline at end of file
+       @echo
+
+varhelp::
+       @echo "    PYTHON_VERSION ($(PYTHON_VERSION))"
+       @echo "        Python version to download and compile."
+       @echo
+       @echo "    PYTHON_URL ($(PYTHON_URL))"
+       @echo "        URL to download python from. The default value is automatically"
+       @echo "        generated from PYTHON_VERSION."
+       @echo
+       @echo "    SETUPTOOLS_URL ($(SETUPTOOLS_URL))"
+       @echo "        URL to download 'ez_setup.py' from."
+       @echo
+       @echo "    PYTHON_DIR ($(PYTHON_DIR))"
+       @echo "        Name of subdirectory for the local python installation."
+       @echo