Removed unnecessary stamp files and fix boostrap sed script

diff --git a/Makefile b/Makefile
index 11ca204..f2cb8de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,51 +17,52 @@ PASTER       = $(BASEDIR)/$(PYTHON_DIR)/bin/paster
 
 default: update
 
-python24-unpack: .python24-unpack.stamp
-.python24-unpack.stamp:
+.PHONY: python-unpack python-build python setuptools eggs pil-unpack pil-build pil buildout \
+       bootstrap update update-nonet shell init
+
+python-unpack: $(PYTHON_DIR)/Python-$(PYTHON_VERSION)/README
+$(PYTHON_DIR)/Python-$(PYTHON_VERSION)/README:
        mkdir $(PYTHON_DIR)
        wget "$(PYTHON_URL)" -O $(PYTHON_DIR)/python.tgz
        tar -C $(PYTHON_DIR) -xzf $(PYTHON_DIR)/python.tgz
        rm -f $(PYTHON_DIR)/python.tgz
-       touch .python24-unpack.stamp
 
-python24-build: .python24-build.stamp
-.python24-build.stamp:
+python-build: $(PYTHON)
+$(PYTHON):
        cd $(PYTHON_DIR)/Python-$(PYTHON_VERSION) && ./configure --prefix=$(BASEDIR)/$(PYTHON_DIR)
        cd $(PYTHON_DIR)/Python-$(PYTHON_VERSION) && make
        cd $(PYTHON_DIR)/Python-$(PYTHON_VERSION) && make install
-       touch .python24-build.stamp
 
-python24: python24-unpack python24-build
+python: python-unpack python-build
 
-setuptools: .setuptools.stamp
-.setuptools.stamp:
+setuptools: $(EASY_INSTALL)
+$(EASY_INSTALL):
        mkdir $(PYTHON_DIR)/Extensions
        wget $(SETUPTOOLS_URL) -O $(PYTHON_DIR)/Extensions/ez_setup.py
        cd $(PYTHON_DIR)/Extensions && $(PYTHON) ez_setup.py
-       touch .setuptools.stamp
 
-eggs: .eggs.stamp
-.eggs.stamp:
+eggs:
        $(EASY_INSTALL) ZopeSkel
        $(EASY_INSTALL) zc.buildout
-       touch .eggs.stamp
 
-pil: .pil.stamp
-.pil.stamp:
+pil-unpack: $(PYTHON_DIR)/Extensions/Imaging-$(PIL_VERSION)/README
+$(PYTHON_DIR)/Extensions/Imaging-$(PIL_VERSION)/README:
        wget $(PIL_URL) -O $(PYTHON_DIR)/Extensions/pil.tgz
        tar -C $(PYTHON_DIR)/Extensions -xzf $(PYTHON_DIR)/Extensions/pil.tgz
        rm -f $(PYTHON_DIR)/Extensions/pil.tgz
+
+pil-build: $(PYTHON_DIR)/bin/pilconvert.py
+$(PYTHON_DIR)/bin/pilconvert.py:
        cd $(PYTHON_DIR)/Extensions/Imaging-$(PIL_VERSION) && $(PYTHON) setup.py install
-       touch .pil.stamp
+
+pil: pil-unpack pil-build
 
 buildout: buildout.cfg
 buildout.cfg:
        $(PASTER) create --no-interactive -t plone3_buildout . zope_password=admin
-       touch .buildout.stamp
 
 bootstrap: 
-       sed -i -e '1s/^#!.*\/python/$(subst /,\/,$(PYTHON))/' $(PYTHON_DIR)/bin/*
+       sed -i -e '1s/^#!.*\/python/#!$(subst /,\/,$(PYTHON))/' $(PYTHON_DIR)/bin/*
        $(PYTHON) bootstrap.py
 
 .gitignore:
@@ -73,7 +74,6 @@ bootstrap:
        @echo "eggs/" >>.gitignore
        @echo "fake-eggs/" >>.gitignore
        @echo "parts/" >>.gitignore
-       @echo "/.*.stamp" >>.gitignore
        @echo "/.installed.cfg" >>.gitignore
        @echo "*.pyc" >>.gitignore
 
@@ -86,4 +86,4 @@ update-nonet:
 shell:
        @PATH=$(BASEDIR)/$(PYTHON_DIR)/bin:$(BASEDIR)/bin:$$PATH $$SHELL
 
-init: python24 setuptools eggs pil buildout bootstrap update .gitignore
+init: python setuptools pil eggs buildout bootstrap update .gitignore