heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various makefile fixes

Browse Source 
- Actually use $(PYTHON) in virtualenv creation
 - Make paste.ini if need be
 - distclean is more forgiving if files aren't there
 - clean up virtualenvs also
This commit is contained in:
Christopher Allan Webber 2014-10-09 13:01:22 -05:00
parent ea2825fa10
commit 1da574c6c9
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.in
View File

@ -64,6 +64,8 @@ maybe_venved = ./bin/
maybe_venved_python = ./bin/python maybe_venved_python = ./bin/python
# Yes, build the virtualenv as a dependency! # Yes, build the virtualenv as a dependency!
maybe_venv_dep = ./bin/python maybe_venv_dep = ./bin/python
# And to clean up!
maybe_venv_clean = clean-virtualenv
else else
# --without-virtualenv must have been passed in... don't build # --without-virtualenv must have been passed in... don't build
@ -72,6 +74,8 @@ maybe_venved =
maybe_venved_python = $(PYTHON) maybe_venved_python = $(PYTHON)
# No need for commands to build virtualenv as a dependency! # No need for commands to build virtualenv as a dependency!
maybe_venv_dep = maybe_venv_dep =
# Nor to clean up!
maybe_venv_clean =
endif endif
.PHONY: all install uninstall distclean info install-html html \ .PHONY: all install uninstall distclean info install-html html \
@ -88,11 +92,12 @@ 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 # We just symlink the mediagoblin from the appropriate python version
# Note, we DO clobber paste.ini ...
paste.ini: paste.ini:
ifeq ($(USE_PYTHON3),yes) ifeq ($(USE_PYTHON3),true)
-ln -s paste.py3.ini paste.ini ln -s paste.py3.ini paste.ini
else else
-ln -s paste.py2.ini paste.ini ln -s paste.py2.ini paste.ini
endif endif
# base-configs: paste.ini mediagoblin.example.ini # base-configs: paste.ini mediagoblin.example.ini
@ -108,7 +113,7 @@ i18n: $(maybe_venv_dep)
ifneq ($(VIRTUALENV),no) ifneq ($(VIRTUALENV),no)
./bin/python: ./bin/python:
rm -f ./bin/python rm -f ./bin/python
virtualenv --system-site-packages . virtualenv --system-site-packages --python=$(PYTHON) .
./bin/python setup.py develop --upgrade ./bin/python setup.py develop --upgrade
virtualenv: bin/python virtualenv: bin/python
@ -143,13 +148,12 @@ clean:
# Clean up the output of configure # Clean up the output of configure
distclean: distclean: $(maybe_venv_clean)
rm -v $(srcdir)/config.log rm -vf $(srcdir)/config.log
rm -v $(srcdir)/config.status rm -vf $(srcdir)/config.status
rm -rvf $(srcdir)/autom4te.cache rm -rvf $(srcdir)/autom4te.cache
rm -v $(srcdir)/aclocal.m4 rm -vf $(srcdir)/aclocal.m4
rm -v $(srcdir)/Makefile rm -vf $(srcdir)/Makefile
rm -v $(srcdir)/env
# 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