From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 10 Oct 2014 15:21:04 +0000 (-0500)
Subject: Remove the paste.ini rule.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2b475821a19083ec40859ccdb8fbc645d4ee6665;p=mediagoblin.git

Remove the paste.ini rule.
---

diff --git a/Makefile.in b/Makefile.in
index 05a001bf..d266cc12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,21 +85,12 @@ installdirs i18n virtualenv
 
 all: develop
 
-develop: $(maybe_venv_dep) i18n paste.ini mediagoblin.ini
+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
 
-# We just symlink the mediagoblin from the appropriate python version
-# Note, we DO clobber paste.ini ...
-paste.ini:
-ifeq ($(USE_PYTHON3),true)
-	ln -s paste.py3.ini paste.ini
-else
-	ln -s paste.py2.ini paste.ini
-endif
-
 # base-configs: paste.ini mediagoblin.example.ini
 
 install: installdirs
@@ -157,6 +148,12 @@ distclean: $(maybe_venv_clean)
 	rm -vf $(srcdir)/Makefile
 
 
+###########################################################################
+# These things aren't really tested / supported yet.
+###########################################################################
+
+
+
 # You can either use the setup.py sdist command or you can roll your own here
 dist:
 #	$(maybe_venved_python) setup.py sdist
@@ -187,6 +184,10 @@ installdirs:
 # endif	
 # 	$(prefix)/bin/gmg dbupdate
 
+######################
+# Needs to be updated?
+######################
+
 # The following show how to install documentation. In this example,
 # docs are built from a separate Makefile contained in the docs
 # directory which uses the SPHINXBUILD variable to store the location