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

Proper cleanup of extlib with a make distclean

Browse Source 
Also be sure to build the actual virtualenv target with a "make" if
that's how we're set up.

This commit sponsored by Pablo J. Urbano Santos.  Thank you!
This commit is contained in:
Christopher Allan Webber 2015-02-17 16:35:40 -06:00
parent 6fc6ba99f3
commit d466977da7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.in
View File

@ -46,6 +46,8 @@ pkgincludedir = $(includedir)/@PACKAGE_NAME@
PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir) PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir)
USE_PYTHON3 = @USE_PYTHON3@ USE_PYTHON3 = @USE_PYTHON3@
EXTLIB_INSTALLS = extlib/jquery extlib/video.js extlib/leaflet extlib/tinymce
# pkgpythondir = @pkgpythondir@ # pkgpythondir = @pkgpythondir@
# pkgpyexecdir = @pkgpyexecdir@ # pkgpyexecdir = @pkgpyexecdir@
# pythondir = @pythondir@ # pythondir = @pythondir@
@ -63,7 +65,7 @@ ifneq ($(VIRTUALENV),no)
maybe_venved = ./bin/ 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 = virtualenv
# And to clean up! # And to clean up!
maybe_venv_clean = clean-virtualenv maybe_venv_clean = clean-virtualenv
@ -86,8 +88,8 @@ installdirs i18n virtualenv docs extlib
all: develop all: develop
ifneq ($(VIRTUALENV),no)
docs: docs:
ifneq ($(VIRTUALENV),no)
source bin/activate && cd docs && make html source bin/activate && cd docs && make html
else else
cd docs && make html cd docs && make html
@ -152,6 +154,9 @@ clean:
# $(maybe_venved_python) setup.py clean # $(maybe_venved_python) setup.py clean
# It's not obvious to me whether the virtualenv/bower/npm things should be
# auto-cleaned as part of distclean. I'm leaning towards "yes" for now but
# I'm not really happy about that.
# Clean up the output of configure # Clean up the output of configure
distclean: $(maybe_venv_clean) distclean: $(maybe_venv_clean)
@ -159,6 +164,8 @@ distclean: $(maybe_venv_clean)
rm -vf $(srcdir)/config.status rm -vf $(srcdir)/config.status
rm -rvf $(srcdir)/autom4te.cache rm -rvf $(srcdir)/autom4te.cache
rm -vf $(srcdir)/aclocal.m4 rm -vf $(srcdir)/aclocal.m4
rm -rf $(EXTLIB_INSTALLS)
rm -rf node_modules
rm -vf $(srcdir)/Makefile rm -vf $(srcdir)/Makefile