From: Tim Vieira <tim.f.vieira@gmail.com>
Date: Mon, 3 Mar 2014 20:54:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://github.com/nwf/dyna into HEAD
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=e088c89f1edd2325a1f106920be857b69171e288;p=dyna2

Merge branch 'master' of ssh://github.com/nwf/dyna into HEAD
---

e088c89f1edd2325a1f106920be857b69171e288
diff --cc Makefile
index 7905e45,5c8fa6c..00b356c
--- a/Makefile
+++ b/Makefile
@@@ -72,10 -76,11 +76,10 @@@ haddock
  # Build our sphinx documentation
  .PHONY: sphinxbuild sphinxdoc
  sphinxbuild:
- 	(cd docs/sphinx; make html)
+ 	which sphinx-build >/dev/null && (cd docs/sphinx; make html)
  
  sphinxdoc: sphinxbuild
 -	python -c 'import webbrowser; \
 -	  webbrowser.open("./docs/sphinx/_build/html/index.html")'
 +	python -m webbrowser "./docs/sphinx/_build/html/index.html"
  
  doc: sphinxbuild haddock