Remove the paste.ini rule.

This commit is contained in:
Christopher Allan Webber 2014-10-10 10:21:04 -05:00
parent 0e58f8105f
commit 2b475821a1

View File

@ -85,21 +85,12 @@ installdirs i18n virtualenv
all: develop 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 # NEVER clobber a user's mediagoblin.ini once they've defined it
mediagoblin.ini: mediagoblin.ini:
cp --no-clobber mediagoblin.example.ini 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 # base-configs: paste.ini mediagoblin.example.ini
install: installdirs install: installdirs
@ -157,6 +148,12 @@ distclean: $(maybe_venv_clean)
rm -vf $(srcdir)/Makefile 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 # You can either use the setup.py sdist command or you can roll your own here
dist: dist:
# $(maybe_venved_python) setup.py sdist # $(maybe_venved_python) setup.py sdist
@ -187,6 +184,10 @@ installdirs:
# endif # endif
# $(prefix)/bin/gmg dbupdate # $(prefix)/bin/gmg dbupdate
######################
# Needs to be updated?
######################
# The following show how to install documentation. In this example, # The following show how to install documentation. In this example,
# docs are built from a separate Makefile contained in the docs # docs are built from a separate Makefile contained in the docs
# directory which uses the SPHINXBUILD variable to store the location # directory which uses the SPHINXBUILD variable to store the location