[GRASS-SVN] r62320 - grass/trunk/gui/wxpython/docs/wxgui_sphinx

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-10-21 06:40:28 -0700 (Tue, 21 Oct 2014)
New Revision: 62320

Modified:
   grass/trunk/gui/wxpython/docs/wxgui_sphinx/Makefile
Log:
wxgui_sphinx: fix sphinx binaries test

Modified: grass/trunk/gui/wxpython/docs/wxgui_sphinx/Makefile
===================================================================
--- grass/trunk/gui/wxpython/docs/wxgui_sphinx/Makefile	2014-10-21 13:21:36 UTC (rev 62319)
+++ grass/trunk/gui/wxpython/docs/wxgui_sphinx/Makefile	2014-10-21 13:40:28 UTC (rev 62320)
@@ -6,27 +6,27 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-APIDOC := $(shell sphinx-apidoc2 --help 2>/dev/null)
+
+APIDOC := $(shell which sphinx-apidoc2)
 ifdef APIDOC
 SPHINXAPIDOC = sphinx-apidoc2
 else
-    APIDOC := $(shell sphinx-apidoc --help 2>/dev/null)
-    ifdef APIDOC
-	SPHINXAPIDOC = sphinx-apidoc
-    endif
+APIDOC := $(shell which sphinx-apidoc)
+ifdef APIDOC
+SPHINXAPIDOC = sphinx-apidoc
 endif
+endif
 
-BUILD := $(shell sphinx-build2 --version 2>/dev/null)
+BUILD := $(shell which sphinx-build2)
 ifdef BUILD
-    SPHINXBUILD = sphinx-build2
+SPHINXBUILD = sphinx-build2
 else
-    BUILD := $(shell sphinx-build --version 2>/dev/null)
-    ifdef BUILD
-	SPHINXBUILD = sphinx-build
-    endif
+BUILD := $(shell which sphinx-build)
+ifdef BUILD
+SPHINXBUILD = sphinx-build
 endif
+endif
 
-
 PAPER         =
 BUILDDIR      = _build
 BUILDDIR_HTML = $(HTMLDIR)/wxgui