Merge branch 'master' into win-ctrl-c

doc/Makefile.am

@@ -1,6 +1,4 @@
-if HAVE_SPHINXBUILD
 SUBDIRS = manual-src
-endif #SPHINXBUILD
 
 doc_xmlrpcdir = $(docdir)/xmlrpc
 dist_doc_xmlrpc_DATA = xmlrpc/aria2mon \

doc/manual-src/en/Makefile.am

@@ -16,8 +16,15 @@ man_MANS = $(BUILDDIR)/man/aria2c.1
 EXTRA_DIST = $(man_MANS) aria2c.rst libaria2.rst index.rst README.rst\
 	technical-notes.rst _static/default2.css mkapiref.py
 
+if HAVE_SPHINXBUILD
 $(man_MANS): aria2c.rst
 	$(MAKE) man
+else
+$(man_MANS):
+	$(warning Building only stub man pages. Please install sphinx-build)
+	if [ ! -d "$(@D)" ]; then mkdir -p "$(@D)"; fi;
+	if [ ! -e "$@" ]; then touch "$@"; fi;
+endif
 
 # Autogenerated rules by sphinx-quickstart
 

doc/manual-src/pt/Makefile.am

@@ -16,8 +16,15 @@ mandir = @mandir@/pt
 man_MANS = $(BUILDDIR)/man/aria2c.1
 EXTRA_DIST = $(man_MANS) aria2c.rst index.rst README.rst _static/default2.css
 
+if HAVE_SPHINXBUILD
 $(man_MANS): aria2c.rst
 	$(MAKE) man
+else
+$(man_MANS):
+	$(warning Building only stub man pages. Please install sphinx-build)
+	if [ ! -d "$(@D)" ]; then mkdir -p "$(@D)"; fi;
+	if [ ! -e "$@" ]; then touch "$@"; fi;
+endif
 
 # Autogenerated rules by sphinx-quickstart
 

doc/manual-src/ru/Makefile.am

@@ -16,8 +16,15 @@ mandir = @mandir@/ru
 man_MANS = $(BUILDDIR)/man/aria2c.1
 EXTRA_DIST = $(man_MANS) aria2c.rst index.rst _static/default2.css
 
+if HAVE_SPHINXBUILD
 $(man_MANS): aria2c.rst
 	$(MAKE) man
+else
+$(man_MANS):
+	$(warning Building only stub man pages. Please install sphinx-build)
+	if [ ! -d "$(@D)" ]; then mkdir -p "$(@D)"; fi;
+	if [ ! -e "$@" ]; then touch "$@"; fi;
+endif
 
 # Autogenerated rules by sphinx-quickstart