protect for cases where index.html and/or LICENSE.txt are not found (like on the...

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index bbdb831..ca37ab6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SCMURL=git://git.onelab.eu/sfa.git
 TARBALL_HOST=root@build.onelab.eu
 TARBALL_TOPDIR=/build/sfa
 # I have an alternate pypitest entry defined in my .pypirc
-PYPI_ARGS= -r pypi
+PYPI_TARGET=pypi
 
 python: version
 
@@ -152,12 +152,21 @@ signatures:
 # did not seem to work the way I was trying to use it, so ...
 
 # this target is still helpful to produce the readme in html from README.md
-index.zip: README.md
+index.zip index.html: README.md
        python readme.py
 
 # I need to run this on my mac as my pypi
-pypi: version
-       setup.py sdist upload $(PYPI_ARGS)
+# run git pull first as this often comes afet a module-tag
+# we need to re-run make so the version is right
+git_pypi: git pypi
+
+git: 
+       git pull
+       $(MAKE) version
+
+# run this only once the sources are in on the right tag
+pypi: index.html
+       setup.py sdist upload -r $(PYPI_TARGET)
        ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG)
        rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG)