Clean up makefile, make `make docs` / `make info` actually work!

This commit sponsored by Alon Levy!  Thank you, for everything!

diff --git a/Makefile.in b/Makefile.in
index 29e9a3c7cd00beabb5474a76b36591bdbcb0f640..e8cff716499900d76255a41839f71d9efcfdf1e2 100644 (file)
--- 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 0b2bccac28eb6a26500e1e698b8e5493d267f623..0f53e4cf035f0a00ce8f6bc090f21a04dc87e8af 100644 (file)
--- 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'),
 ]
 

diff --git a/setup.py b/setup.py
index 624aa409179605a6cc300bf2ca66b48b1e3afcc0..f99ff1d782dfba2d3ea77b67a07f48b88bbaedd2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -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',