summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Hurlbut <ghurlbut@mythtv.org>2010-12-16 07:19:57 (GMT)
committer Gavin Hurlbut <ghurlbut@mythtv.org>2010-12-16 07:19:57 (GMT)
commit64d9d7c52f301bb4ddf65ef97a02e46cff810b02 (patch)
treee36035ad24e33ed79ae4ad2da9d9056666f8e57d
parent7cdfb8eb450c787c40a6b2ee70b7f641b20f6cb9 (diff)
Add INSTALL_ROOT support for mythffmpeg/play
Backported from master. I had to filter out the BINDIR, etc from the mythtv config.mak which we promptly override anyways.
-rwxr-xr-xmythtv/configure3
1 files changed, 2 insertions, 1 deletions
diff --git a/mythtv/configure b/mythtv/configure
index 12e1ac0..7099422 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -4772,7 +4772,8 @@ SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}
SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
EOF
-cat >> external/FFmpeg/config.mak < $MYTH_CONFIG_MAK
+# Strip out the old dirs that we are about to put back in.
+sed -e '/^S?H?LIBDIR=.*$/d' -e '/^INCDIR=.*$/d' -e '/^BINDIR=.*$/d' -e '/^DATADIR=.*$/d' -e '/^MANDIR=.*$/d' $MYTH_CONFIG_MAK >> external/FFmpeg/config.mak
cat >> external/FFmpeg/config.mak <<EOF
LIBDIR=\$(INSTALL_ROOT)$libdir
SHLIBDIR=\$(INSTALL_ROOT)$shlibdir