From b18bde70c9aa805141381a48aceb03b89425b0a2 Mon Sep 17 00:00:00 2001 From: Nicolas Sebrecht Date: Mon, 7 Mar 2011 22:23:21 +0100 Subject: [PATCH] doc: rst2xxx: fix ignoring output while determining the command name Signed-off-by: Nicolas Sebrecht --- Changelog.draft.rst | 2 ++ Makefile | 2 +- docs/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog.draft.rst b/Changelog.draft.rst index b8c82f8..6d28f42 100644 --- a/Changelog.draft.rst +++ b/Changelog.draft.rst @@ -19,6 +19,8 @@ Changes Bug Fixes --------- +* Fix ignoring output while determining the rst2xxx command name to build + documentation. * Fix hang because of infinite loop reading EOF. * Fix regression (UIBase is no more). diff --git a/Makefile b/Makefile index 7d45f38..3e5cd93 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ VERSION=6.3.2 TARGZ=offlineimap_$(VERSION).tar.gz SHELL=/bin/bash -RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py` +RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py` all: build diff --git a/docs/Makefile b/docs/Makefile index fff639d..70a99a2 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -5,8 +5,8 @@ SOURCES = $(wildcard *.rst) HTML_TARGETS = $(patsubst %.rst,%.html,$(SOURCES)) RM = rm -RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py` -RST2MAN=`type rst2man 2>/dev/null 2>&1 && echo rst2man || echo rst2man.py` +RST2HTML=`type rst2html >/dev/null 2>&1 && echo rst2html || echo rst2html.py` +RST2MAN=`type rst2man >/dev/null 2>&1 && echo rst2man || echo rst2man.py` all: html