fix: Makefile release deps

nicfit · Mar 13, 2017 · 74be160 · 74be160
1 parent 0d2cf32
commit 74be160
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: help build test clean dist install coverage pre-release release \
-        docs clean-docs lint tags docs-dist docs-view coverage-view changelog \
+        docs clean-docs lint tags coverage-view changelog \
         clean-pyc clean-build clean-patch clean-local clean-test-data \
         test-all test-data build-release freeze-release tag-release \
         pypi-release web-release github-release cookiecutter requirements
@@ -112,11 +112,6 @@ docs:
 docs-view: docs
 	$(BROWSER) docs/_build/html/index.html
 
-docs-dist: clean-docs docs
-	test -d dist || mkdir dist
-	cd docs/_build && \
-	    tar czvf ../../dist/${PROJECT_NAME}-${VERSION}_docs.tar.gz html
-
 clean-docs:
 	$(MAKE) -C docs clean
 	-rm README.html
@@ -125,7 +120,10 @@ clean-docs:
 servedocs: docs
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
-pre-release: lint test changelog requirements docs
+pre-release: lint test changelog requirements
+	@# Keep docs off pre-release target list, else it is pruned during 'release' but
+	@# after a clean.
+	@$(MAKE) docs
 	@echo "VERSION: $(VERSION)"
 	$(eval RELEASE_TAG = v${VERSION})
 	@echo "RELEASE_TAG: $(RELEASE_TAG)"
@@ -178,7 +176,7 @@ tag-release:
 	git tag -a $(RELEASE_TAG) -m "Release $(RELEASE_TAG)"
 	git push --tags origin
 
-release: clean pre-release freeze-release build-release tag-release upload-release
+release: pre-release freeze-release build-release tag-release upload-release
 
 github-release:
 	name="${RELEASE_TAG}"; \
@@ -220,7 +218,9 @@ sdist: build
 	python setup.py bdist_egg
 	python setup.py bdist_wheel
 
-dist: gettext sdist docs-dist
+dist: clean gettext sdist docs
+	cd docs/_build && \
+	    tar czvf ../../dist/${PROJECT_NAME}-${VERSION}_docs.tar.gz html
 	@# The cd dist keeps the dist/ prefix out of the md5sum files
 	cd dist && \
 	for f in $$(ls); do \

diff --git a/cookiecutter/{{cookiecutter.project_name}}/Makefile b/cookiecutter/{{cookiecutter.project_name}}/Makefile
@@ -1,5 +1,5 @@
 .PHONY: help build test clean dist install coverage pre-release release \
-        docs clean-docs lint tags docs-dist docs-view coverage-view changelog \
+        docs clean-docs lint tags coverage-view changelog \
         clean-pyc clean-build clean-patch clean-local clean-test-data \
         test-all test-data build-release freeze-release tag-release \
         pypi-release web-release github-release cookiecutter requirements
@@ -115,11 +115,6 @@ docs:
 docs-view: docs
 	$(BROWSER) docs/_build/html/index.html
 
-docs-dist: clean-docs docs
-	test -d dist || mkdir dist
-	cd docs/_build && \
-	    tar czvf ../../dist/${PROJECT_NAME}-${VERSION}_docs.tar.gz html
-
 clean-docs:
 	$(MAKE) -C docs clean
 	-rm README.html
@@ -128,7 +123,10 @@ clean-docs:
 servedocs: docs
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
-pre-release: lint test changelog requirements docs
+pre-release: lint test changelog requirements
+	@# Keep docs off pre-release target list, else it is pruned during 'release' but
+	@# after a clean.
+	@$(MAKE) docs
 	@echo "VERSION: $(VERSION)"
 	$(eval RELEASE_TAG = v${VERSION})
 	@echo "RELEASE_TAG: $(RELEASE_TAG)"
@@ -181,7 +179,7 @@ tag-release:
 	git tag -a $(RELEASE_TAG) -m "Release $(RELEASE_TAG)"
 	git push --tags origin
 
-release: clean pre-release freeze-release build-release tag-release upload-release
+release: pre-release freeze-release build-release tag-release upload-release
 
 github-release:
 	name="${RELEASE_TAG}"; \
@@ -224,10 +222,12 @@ sdist: build
 	python setup.py bdist_wheel
 
 {% if cookiecutter.gettext_domain != "None" -%}
-dist: gettext sdist docs-dist
+dist: clean gettext sdist docs
 {%- else -%}
-dist: sdist docs-dist
+dist: clean sdist docs
 {%- endif %}
+	cd docs/_build && \
+	    tar czvf ../../dist/${PROJECT_NAME}-${VERSION}_docs.tar.gz html
 	@# The cd dist keeps the dist/ prefix out of the md5sum files
 	cd dist && \
 	for f in $$(ls); do \