Sfoglia il codice sorgente

Change manual build dir to doc/manual-src/*/_build. Drop html install.

Sphinx HTML markups are beautiful, but it uses many asset files, such
as stylesheets, javascripts and images.  While it is no problem to
upload them in web site, but distributing and installing them in
individual user have some problems.  For example, Sphinx uses same
assets for generated sites, so if many applications uses Sphinx
generated docs and they are installed in the PC, it is huge waste of
the disk space. I'm also not comfortable to copy HTML trees to the
install directory using 'cp -r' command.  I seeked other format like
pdf and texi which Sphinx can generate but annoyingly they all convert
'--' into en-dash and there is no workaround to disable it. So I
decided to drop HTML manual from distribution and installation.  For
users who want to HTML version manual, see it online:
http://aria2.sourceforge.net/manual/en/html/
Tatsuhiro Tsujikawa 13 anni fa
parent
commit
8ebba32fd9
2 ha cambiato i file con 4 aggiunte e 42 eliminazioni
  1. 2 21
      doc/manual-src/en/Makefile.am
  2. 2 21
      doc/manual-src/ru/Makefile.am

+ 2 - 21
doc/manual-src/en/Makefile.am

@@ -4,7 +4,7 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = $(top_srcdir)/doc/manual/en
+BUILDDIR      = _build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -13,30 +13,11 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 # Configurations for aria2.
 man_MANS = $(BUILDDIR)/man/aria2c.1
-HTML = $(BUILDDIR)/html
-EXTRA_DIST = aria2c.rst $(man_MANS) $(HTML)
-HTMLINSTALLDIR = $(DESTDIR)$(docdir)/manual/en
-
-# Copy $(BUILDDIR)/html recursively to the install dir. Since Automake
-# does not provide this feature, we do it ourselves.
-install-data-local: $(HTML)
-	mkdir -p $(HTMLINSTALLDIR) && \
-	cp -r $(BUILDDIR)/html $(HTMLINSTALLDIR) && \
-	chmod -R u+w $(HTMLINSTALLDIR) && \
-	rm -f $(HTMLINSTALLDIR)/html/.buildinfo
-
-uninstall-local:
-	-rm -rf $(HTMLINSTALLDIR)
-
-dist-hook:
-	-rm -f $(distdir)/$(BUILDDIR)/html/.buildinfo
+EXTRA_DIST = $(man_MANS) aria2c.rst index.rst
 
 $(man_MANS): aria2c.rst
 	$(MAKE) man
 
-$(HTML):
-	$(MAKE) html
-
 # Autogenerated rules by sphinx-quickstart
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest

+ 2 - 21
doc/manual-src/ru/Makefile.am

@@ -4,7 +4,7 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
-BUILDDIR      = $(top_srcdir)/doc/manual/ru
+BUILDDIR      = _build
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -14,30 +14,11 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # Configurations for aria2.
 mandir = @mandir@/ru
 man_MANS = $(BUILDDIR)/man/aria2c.1
-HTML = $(BUILDDIR)/html
-EXTRA_DIST = aria2c.rst $(man_MANS) $(HTML)
-HTMLINSTALLDIR = $(DESTDIR)$(docdir)/manual/ru
-
-# Copy $(BUILDDIR)/html recursively to the install dir. Since Automake
-# does not provide this feature, we do it ourselves.
-install-data-local: $(HTML)
-	mkdir -p $(HTMLINSTALLDIR) && \
-	cp -r $(BUILDDIR)/html $(HTMLINSTALLDIR) && \
-	chmod -R u+w $(HTMLINSTALLDIR) && \
-	rm -f $(HTMLINSTALLDIR)/html/.buildinfo
-
-uninstall-local:
-	-rm -rf $(HTMLINSTALLDIR)
-
-dist-hook:
-	-rm -f $(distdir)/$(BUILDDIR)/html/.buildinfo
+EXTRA_DIST = $(man_MANS) aria2c.rst index.rst
 
 $(man_MANS): aria2c.rst
 	$(MAKE) man
 
-$(HTML):
-	$(MAKE) html
-
 # Autogenerated rules by sphinx-quickstart
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest