X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Makefile.in;h=56e8a6838d5cda7565ef0532d0f8ad3569c1f98c;hb=772a07e94f037f62f013aca376019989ebf8cb28;hp=06ceb59474f7cb1a92265096749e3ed24aa1f6a7;hpb=9cc496f48fd820f5904b54bed1a0448239218ba5;p=mediagoblin.git

diff --git a/Makefile.in b/Makefile.in
index 06ceb594..56e8a683 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 # Makefile.in
 #
 # Copyright © 2012, 2013 Brandon Invergo <brandon@invergo.net>
+# Copyright © 2014, 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -104,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
 
@@ -120,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
@@ -142,17 +143,14 @@ endif
 # 	rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
 # 
 
-
-clean:
-	@echo "No rule to clean house, yet."
-	@echo "distclean works but might do more than you want. :)"
-
-
 # We don't know what this does yet.
 # Originally:
 ## Just use the usual setup.py clean command
 #clean:
 #	$(maybe_venved_python) setup.py clean
+clean:
+	@echo "No rule to clean house, yet."
+	@echo "distclean works but might do more than you want. :)"
 
 
 # It's not obvious to me whether the virtualenv/bower/npm things should be
@@ -169,43 +167,27 @@ 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
 installdirs:
 	$(MKDIR_P) $(DESTDIR)$(prefix)
 
-# # Set up PostgreSQL
-# postgresql:
-# 	sudo -u $(POSTGRES) createuser mediagoblin
-# 	sudo -u $(POSTGRES) createdb -E UNICODE -O mediagoblin mediagoblin
-
-# update:
-# ifneq ($(VIRTUALENV),no)
-# 	$(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
-# else
-# 	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
-# endif	
-# 	$(prefix)/bin/gmg dbupdate
-
 ######################
 # Needs to be updated?
 ######################
@@ -226,41 +208,14 @@ $(DESTDIR)$(infodir)/mediagoblin.info: docs/build/texinfo/mediagoblin.info
 info: docs/build/texinfo/mediagoblin.info
 
 docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*)
-ifneq ($(SPHINXBUILD),no)
-	$(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD)
+ifneq ($(VIRTUALENV),no)
+	source bin/activate && cd docs && make info
+else
+	cd docs && make info
 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