From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 22 Sep 2016 18:56:09 +0000 (+0200)
Subject: mpv: Use rst2man package instead of pip install
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/39d7cdd7f16012a5f2d577368fd166fcf91ebd40

mpv: Use rst2man package instead of pip install
---

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index fb8ac5f1..e7542a19 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -8,10 +8,6 @@ TERMUX_PKG_DEPENDS="ffmpeg, openal-soft"
 termux_step_make_install () {
 	cd $TERMUX_PKG_SRCDIR
 
-	# Setup rst2man for man page generation of mpv.1:
-	pip install docutils
-	export RST2MAN=$HOME/.local/bin/rst2man.py
-
 	./bootstrap.py
 
 	./waf configure \
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 82a9e1f7..3f921bd6 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -23,6 +23,7 @@ PACKAGES="$PACKAGES unzip"
 PACKAGES="$PACKAGES m4"
 PACKAGES="$PACKAGES openjdk-8-jdk"		# Used for android-sdk.
 PACKAGES="$PACKAGES pkg-config"
+PACKAGES="$PACKAGES python-docutils"		# For rst2man, used by mpv.
 PACKAGES="$PACKAGES scons"
 PACKAGES="$PACKAGES texinfo"
 PACKAGES="$PACKAGES xmlto"