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

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

Browse Source 
This commit sponsored by Alon Levy!  Thank you, for everything!
This commit is contained in:
Christopher Allan Webber 2015-02-17 17:55:00 -06:00
parent 94eb44d61b
commit 09e2db3089
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile.in
View File

@ -143,17 +143,14 @@ endif
# rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info # 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. # We don't know what this does yet.
# Originally: # Originally:
## Just use the usual setup.py clean command ## Just use the usual setup.py clean command
#clean: #clean:
# $(maybe_venved_python) setup.py 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 # It's not obvious to me whether the virtualenv/bower/npm things should be
@ -194,19 +191,6 @@ check:
installdirs: installdirs:
$(MKDIR_P) $(DESTDIR)$(prefix) $(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? # Needs to be updated?
###################### ######################
@ -227,8 +211,10 @@ $(DESTDIR)$(infodir)/mediagoblin.info: docs/build/texinfo/mediagoblin.info
info: docs/build/texinfo/mediagoblin.info info: docs/build/texinfo/mediagoblin.info
docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*) docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*)
ifneq ($(SPHINXBUILD),no) ifneq ($(VIRTUALENV),no)
$(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD) source bin/activate && cd docs && make info
else
cd docs && make info
endif endif

4
docs/source/conf.py
View File

@ -219,7 +219,7 @@ latex_documents = [
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'gnumediagoblin', u'GNU MediaGoblin Documentation', ('index', 'mediagoblin', u'GNU MediaGoblin Documentation',
[u'Chris Webber, et al'], 1) [u'Chris Webber, et al'], 1)
] ]
@ -233,7 +233,7 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ 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'), 'GNU MediaGoblin', 'Media sharing web application.', 'Miscellaneous'),
] ]

1
setup.py
View File

@ -78,6 +78,7 @@ install_requires = [
'sqlalchemy<0.9.0, >0.8.0', 'sqlalchemy<0.9.0, >0.8.0',
'itsdangerous', 'itsdangerous',
'pytz', 'pytz',
'sphinx',
# PLEASE change this when we can; a dependency is forcing us to set this # PLEASE change this when we can; a dependency is forcing us to set this
# specific number and it is breaking setup.py develop # specific number and it is breaking setup.py develop
'six==1.5.2', 'six==1.5.2',