diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-02-17 17:55:00 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-02-17 17:55:00 -0600 |
| commit | 09e2db3089135a43d17ff1f249c3376bf31fa1ba (patch) | |
| tree | 1eb124ee85d67ca3285a86a742c5e3f0efa7d5fd | |
| parent | 94eb44d61bec3ab922ea3d2ffcc1e14b7eeb450d (diff) | |
| download | mediagoblin-09e2db3089135a43d17ff1f249c3376bf31fa1ba.tar.lz mediagoblin-09e2db3089135a43d17ff1f249c3376bf31fa1ba.tar.xz mediagoblin-09e2db3089135a43d17ff1f249c3376bf31fa1ba.zip | |
Clean up makefile, make `make docs` / `make info` actually work!
This commit sponsored by Alon Levy! Thank you, for everything!
| -rw-r--r-- | Makefile.in | 28 | ||||
| -rw-r--r-- | docs/source/conf.py | 4 | ||||
| -rw-r--r-- | setup.py | 1 |
3 files changed, 10 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index 29e9a3c7..e8cff716 100644 --- a/Makefile.in +++ b/Makefile.in @@ -143,17 +143,14 @@ endif # rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info # - -clean: - @echo "No rule to clean house, yet." - @echo "distclean works but might do more than you want. :)" - - # We don't know what this does yet. # Originally: ## Just use the usual setup.py clean command #clean: # $(maybe_venved_python) setup.py clean +clean: + @echo "No rule to clean house, yet." + @echo "distclean works but might do more than you want. :)" # It's not obvious to me whether the virtualenv/bower/npm things should be @@ -194,19 +191,6 @@ check: installdirs: $(MKDIR_P) $(DESTDIR)$(prefix) -# # Set up PostgreSQL -# postgresql: -# sudo -u $(POSTGRES) createuser mediagoblin -# sudo -u $(POSTGRES) createdb -E UNICODE -O mediagoblin mediagoblin - -# update: -# ifneq ($(VIRTUALENV),no) -# $(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade -# else -# $(PYTHON) $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade -# endif -# $(prefix)/bin/gmg dbupdate - ###################### # Needs to be updated? ###################### @@ -227,8 +211,10 @@ $(DESTDIR)$(infodir)/mediagoblin.info: docs/build/texinfo/mediagoblin.info info: docs/build/texinfo/mediagoblin.info docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*) -ifneq ($(SPHINXBUILD),no) - $(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD) +ifneq ($(VIRTUALENV),no) + source bin/activate && cd docs && make info +else + cd docs && make info endif diff --git a/docs/source/conf.py b/docs/source/conf.py index 0b2bccac..0f53e4cf 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -219,7 +219,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'gnumediagoblin', u'GNU MediaGoblin Documentation', + ('index', 'mediagoblin', u'GNU MediaGoblin Documentation', [u'Chris Webber, et al'], 1) ] @@ -233,7 +233,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'gnumediagoblin', u'GNU MediaGoblin Documentation', u'gnumediagoblin', + ('index', 'mediagoblin', u'GNU MediaGoblin Documentation', u'mediagoblin', 'GNU MediaGoblin', 'Media sharing web application.', 'Miscellaneous'), ] @@ -78,6 +78,7 @@ install_requires = [ 'sqlalchemy<0.9.0, >0.8.0', 'itsdangerous', 'pytz', + 'sphinx', # PLEASE change this when we can; a dependency is forcing us to set this # specific number and it is breaking setup.py develop 'six==1.5.2', |