From e0aef8cf1275cc988007fcb2a099cdd9f92fa374 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 2 Nov 2012 14:37:02 +0100 Subject: configure: detect rst2man binary name --- Makefile | 4 ++-- configure | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ffa73a8781..3f32e5639f 100644 --- a/Makefile +++ b/Makefile @@ -326,7 +326,7 @@ endif all: $(ALL_PRG-yes) locales %.1: %.rst - rst2man $< $@ + $(RST2MAN) $< $@ %.o: %.S $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< @@ -414,7 +414,7 @@ osdep/mpv-rc.o: osdep/mpv.exe.manifest ###### installation / clean / generic rules ####### check_rst2man: - @which rst2man > /dev/null 2>&1 || (printf "\n\trst2man not found. You need the docutils (>= 0.7) to generate the manpages. Alternatively you can use 'install-no-man' rule.\n\n" && exit 1) + @which $(RST2MAN) > /dev/null 2>&1 || (printf "\n\trst2man not found. You need the docutils (>= 0.7) to generate the manpages. Alternatively you can use 'install-no-man' rule.\n\n" && exit 1) install: $(INSTALL_TARGETS-yes) diff --git a/configure b/configure index 8f7a2a0407..b0c3a53932 100755 --- a/configure +++ b/configure @@ -956,6 +956,11 @@ if cygwin ; then extra_cflags="$extra_cflags -mwin32" fi +_rst2man=rst2man +if [ -f "$(which rst2man.py)" ] ; then + _rst2man=rst2man.py +fi + TMPC="$mplayer_tmpdir/tmp.c" TMPCPP="$mplayer_tmpdir/tmp.cpp" TMPEXE="$mplayer_tmpdir/tmp$_exesuf" @@ -3332,6 +3337,7 @@ EXTRALIBS_MPLAYER = $libs_mplayer GETCH = $_getch TIMER = $_timer +RST2MAN = $_rst2man EXESUF = $_exesuf EXESUFS_ALL = .exe -- cgit v1.2.3