Navigation Menu

Skip to content

Commit

Permalink
Add INSTALL_ROOT support for mythffmpeg/play
Browse files Browse the repository at this point in the history
Backported from master.   I had to filter out the BINDIR, etc from the mythtv
config.mak which we promptly override anyways.
  • Loading branch information
Beirdo committed Dec 16, 2010
1 parent 7cdfb8e commit 64d9d7c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion mythtv/configure
Expand Up @@ -4772,7 +4772,8 @@ SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}
SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD} SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD} SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
EOF 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 cat >> external/FFmpeg/config.mak <<EOF
LIBDIR=\$(INSTALL_ROOT)$libdir LIBDIR=\$(INSTALL_ROOT)$libdir
SHLIBDIR=\$(INSTALL_ROOT)$shlibdir SHLIBDIR=\$(INSTALL_ROOT)$shlibdir
Expand Down

0 comments on commit 64d9d7c

Please sign in to comment.