[PATCH] doc Makefile: Fix rst2html detection

Mads Kiilerich mads at kiilerich.com
Wed Dec 16 16:59:54 CST 2009

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1261004390 -3600
# Node ID 1c0a11fc2071ad70a43f1e596f9364489f4d868d
# Parent  3f3f9c5bbe2b7fcf02acbe8f549ff6ac4c22c662
doc Makefile: Fix rst2html detection

Displaying the output from the failing "which" didn't prevent make from doing
stupid things later.

Now we assume that "which" emits a path if it succeeds, and if none of the
names are found we just use a non-existing name and let it fail later.

diff --git a/doc/Makefile b/doc/Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,7 +6,7 @@
 INSTALL=install -c -m 644
-RST2HTML=$(shell which rst2html 2> /dev/null || which rst2html.py)
+RST2HTML=$(shell (which rst2html || which rst2html.py || echo rst2html.py) 2> /dev/null)
 export LC_ALL=C

More information about the Mercurial-devel mailing list