aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin/src/mediaplugins/ffmpeg/configure
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-11-25 11:05:44 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-11-25 11:05:44 +0000
commitf238d1fd97cb605da60bbad619baa215d4569c32 (patch)
tree1a953af7850e03227486bab2a7d6db6560f249d1 /mediaplugin/src/mediaplugins/ffmpeg/configure
parentb84df627dc3910e8685de787ba7eb9541e8f2ae8 (diff)
downloadusdx-f238d1fd97cb605da60bbad619baa215d4569c32.tar.gz
usdx-f238d1fd97cb605da60bbad619baa215d4569c32.tar.xz
usdx-f238d1fd97cb605da60bbad619baa215d4569c32.zip
move /src/plugins/media to src/mediaplugins and /game/plugins/media to /game/mediaplugins
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2753 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rwxr-xr-xmediaplugin/src/mediaplugins/ffmpeg/configure (renamed from mediaplugin/src/plugins/media/ffmpeg/configure)6
-rw-r--r--mediaplugin/src/mediaplugins/ffmpeg/configure.ac (renamed from mediaplugin/src/plugins/media/ffmpeg/configure.ac)4
2 files changed, 5 insertions, 5 deletions
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure b/mediaplugin/src/mediaplugins/ffmpeg/configure
index 091fe80b..16b972df 100755
--- a/mediaplugin/src/plugins/media/ffmpeg/configure
+++ b/mediaplugin/src/mediaplugins/ffmpeg/configure
@@ -2466,7 +2466,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Set the path to install-sh
ac_aux_dir=
-for ac_dir in ../../../../dists/autogen "$srcdir"/../../../../dists/autogen; do
+for ac_dir in ../../../dists/autogen "$srcdir"/../../../dists/autogen; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2482,7 +2482,7 @@ for ac_dir in ../../../../dists/autogen "$srcdir"/../../../../dists/autogen; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../../../dists/autogen \"$srcdir\"/../../../../dists/autogen" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../../dists/autogen \"$srcdir\"/../../../dists/autogen" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -15004,7 +15004,7 @@ case "${target_os}" in
esac
-PLUGIN_DIR="../../../../game/plugins/media"
+PLUGIN_DIR="../../../game/mediaplugins"
# -----------------------------------------
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure.ac b/mediaplugin/src/mediaplugins/ffmpeg/configure.ac
index 99ee770f..f8bfd5b1 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/configure.ac
+++ b/mediaplugin/src/mediaplugins/ffmpeg/configure.ac
@@ -16,7 +16,7 @@ AC_INIT([usdx-ffmpeg-plugin], [1.1])
AC_CONFIG_SRCDIR(.)
# Set the path to install-sh
-AC_CONFIG_AUX_DIR(../../../../dists/autogen)
+AC_CONFIG_AUX_DIR(../../../dists/autogen)
# show features and packages in one list
AC_PRESERVE_HELP_ORDER
@@ -76,7 +76,7 @@ case "${target_os}" in
esac
AC_SUBST(LIB_EXT)
-PLUGIN_DIR="../../../../game/plugins/media"
+PLUGIN_DIR="../../../game/mediaplugins"
AC_SUBST(PLUGIN_DIR)
# -----------------------------------------