diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-08 12:55:44 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-10 14:42:16 -0500 |
| commit | 96f9c530ea38585aced7bf1a6abe50d3d3911c37 (patch) | |
| tree | 202ee2555719ac123ecc7af8bf75494d3a1c9094 /Makefile.in | |
| parent | 9421705a702caa86d8c27ffffdfbdcb8b760fffd (diff) | |
| download | mediagoblin-96f9c530ea38585aced7bf1a6abe50d3d3911c37.tar.lz mediagoblin-96f9c530ea38585aced7bf1a6abe50d3d3911c37.tar.xz mediagoblin-96f9c530ea38585aced7bf1a6abe50d3d3911c37.zip | |
Most of the way to having a desirable `./configure && make` setup
Tries to simplify a lot of the configure code. This is mostly because I
found what I expected the previous configure setup to do wasn't quite
what it was doing.
Also supports a --with-python3 option.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index d874674a..5eb08da4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,8 +24,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PYTHON = @PYTHON@ VIRTUALENV = @VIRTUALENV@ -SPHINXBUILD = @SPHINXBUILD@ -POSTGRES = @POSTGRES@ SHELL = @SHELL@ MKDIR_P = @MKDIR_P@ INSTALL = @INSTALL@ @@ -43,14 +41,18 @@ srcdir = @srcdir@ abs_srcdir = @abs_srcdir@ datadir = @datadir@ datarootdir = @datarootdir@ -pythondir = @pythondir@ -pyexecdir = @pyexecdir@ pkgdatadir = $(datadir)/@PACKAGE_NAME@ pkgincludedir = $(includedir)/@PACKAGE_NAME@ -pkgpythondir = @pkgpythondir@ -pkgpyexecdir = @pkgpyexecdir@ PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir) +# pkgpythondir = @pkgpythondir@ +# pkgpyexecdir = @pkgpyexecdir@ +# pythondir = @pythondir@ +# pyexecdir = @pyexecdir@ +# SPHINXBUILD = @SPHINXBUILD@ +# POSTGRES = @POSTGRES@ + + # Maybe add a virtualenv prefix to a command ifneq ($(VIRTUALENV),no) # virtualenv specified to be included by config (default) @@ -80,9 +82,11 @@ installdirs i18n virtualenv all: develop -develop: +develop: $(maybe_venv_dep) i18n echo "nothin yet" +# base-configs: paste.ini mediagoblin.example.ini + install: installdirs $(maybe_venved_python) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix) @@ -98,6 +102,10 @@ ifneq ($(VIRTUALENV),no) ./bin/python setup.py develop --upgrade virtualenv: bin/python + +clean-virtualenv: + rm -rf ./bin/ + rm -rf ./lib/ endif # setup.py doesn't (yet) support an uninstall command, so until it does, you @@ -123,6 +131,8 @@ distclean: rm -rvf $(srcdir)/autom4te.cache rm -v $(srcdir)/aclocal.m4 rm -v $(srcdir)/Makefile + rm -v $(srcdir)/env + # You can either use the setup.py sdist command or you can roll your own here dist: |