Migration for #5415 - I forgot it, Doh!

[mediagoblin.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e8cff716499900d76255a41839f71d9efcfdf1e2..56e8a6838d5cda7565ef0532d0f8ad3569c1f98c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ develop: $(maybe_venv_dep) i18n mediagoblin.ini
 
 # NEVER clobber a user's mediagoblin.ini once they've defined it
 mediagoblin.ini:
-       cp --no-clobber mediagoblin.example.ini mediagoblin.ini
+       cp -n mediagoblin.example.ini mediagoblin.ini
 
 # base-configs: paste.ini mediagoblin.example.ini
 
@@ -121,7 +121,7 @@ i18n: $(maybe_venv_dep)
 ifneq ($(VIRTUALENV),no)
 ./bin/python:
        rm -f ./bin/python
-       virtualenv --system-site-packages --python=$(PYTHON) .
+       ${VIRTUALENV} --system-site-packages --python=$(PYTHON) .
        ./bin/python setup.py develop --upgrade
 
 virtualenv: bin/python extlib
@@ -167,24 +167,21 @@ distclean: $(maybe_venv_clean)
        rm -rf node_modules
        rm -vf $(srcdir)/Makefile
 
+check:
+       ./runtests.sh
 
 ###########################################################################
 # These things aren't really tested / supported yet.
 ###########################################################################
 
 
+## NOTE: We don't use this yet, we use ./devtools/maketarball.sh
+##   We can't switch out ./devtools/maketarball.sh in here because
+##   it requires a git revision as a first argument, which
+##   doesn't always work here
 
-# You can either use the setup.py sdist command or you can roll your own here
-dist: extlib
-#      $(maybe_venved_python) setup.py sdist
-       mkdir $(PACKAGE_DISTNAME)
-       cp -r $(DISTFILES) $(PACKAGE_DISTNAME)
-       tar -czf $(PACKAGE_DISTNAME).tar.gz $(PACKAGE_DISTNAME)
-       rm -rf $(PACKAGE_DISTNAME)
-
-# Use the setup.py check command
-check:
-       $(maybe_venved_python) setup.py check
+dist: $(maybe_venv_dep)
+       $(maybe_venved_python) setup.py sdist
 
 # setup.py might complain if a directory doesn't exist so just in case, make the directory
 # here
@@ -221,33 +218,4 @@ endif
 install-html: html installdirs
        $(INSTALL_DATA) docs/build/html/* $(DESTDIR)$(htmldir)
 
-html: docs/build/html/index.html
-
-docs/build/html/index.html: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-       $(MAKE) -C docs html SPHINXBUILD=$(SPHINXBUILD)
-endif
-
-
-install-pdf: pdf installdirs
-       $(INSTALL_DATA) docs/build/latex/mediagoblin.pdf $(DESTDIR)$(pdfdir)
-
-pdf: docs/build/latex/mediagoblin.pdf
-
-docs/build/latex/mediagoblin.pdf: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-       $(MAKE) -C docs latexpdf SPHINXBUILD=$(SPHINXBUILD)
-endif
-
-
-# Targets that don't seem supported?
-
-install-dvi:
-
-dvi:
-
-install-ps:
-
-ps:
-
-
+html: docs