Skip to content
Browse files

Move the libav submodule up a level

- No real need for that subdir anymore
  • Loading branch information...
1 parent fbc215e commit 7d04240912b24dcebdb19373451af4cbf7384eb5 @samiamwork samiamwork committed Dec 18, 2011
Showing with 5 additions and 6 deletions.
  1. +2 −2 .gitmodules
  2. +1 −2 build_extlib.sh
  3. +2 −2 contrib/{src → }/build_libav.sh
  4. 0 contrib/{src → }/libav
View
4 .gitmodules
@@ -1,3 +1,3 @@
-[submodule "contrib/src/libav"]
- path = contrib/src/libav
+[submodule "contrib/libav"]
+ path = contrib/libav
url = git://git.libav.org/libav.git
View
3 build_extlib.sh
@@ -3,7 +3,6 @@ set -o errexit
SRCROOT="$PWD"
export CONTRIB_PATH="$SRCROOT/contrib/"
-export CONTRIB_SRC_PATH="$CONTRIB_PATH/src/"
if [ "$1" = "clean" ]; then
rm -rf $CONTRIB_PATH/build
@@ -14,7 +13,7 @@ fi
make -C $CONTRIB_PATH -f Makefile.matroska
# build libav
-cd "$CONTRIB_SRC_PATH" && sh build_libav.sh
+cd "$CONTRIB_PATH" && sh build_libav.sh
# universal
cd "$SRCROOT" && sh make_univlib.sh
View
4 contrib/src/build_libav.sh → contrib/build_libav.sh
@@ -38,7 +38,7 @@ build_libav()
########## INTEL i386 ###########
-PREFIX="$(cd ../build;pwd)/i386"
+PREFIX="$(cd build;pwd)/i386"
PATH="$PREFIX/bin:$ORIGINAL_PATH"
THEARC="i386"
THECPU="pentium-m"
@@ -48,7 +48,7 @@ build_libav
########## INTEL x86_64 ###########
-PREFIX="$(cd ../build;pwd)/x86_64"
+PREFIX="$(cd build;pwd)/x86_64"
PATH="$PREFIX/bin:$ORIGINAL_PATH"
THEARC="x86_64"
THECPU="core2"
View
0 contrib/src/libav → contrib/libav
File renamed without changes.

0 comments on commit 7d04240

Please sign in to comment.
Something went wrong with that request. Please try again.