[Android] Fix sed in compile script for BSD version in Mac
Immanuel Thomas
git at videolan.org
Mon Jul 24 15:20:20 CEST 2017
vlc-android | branch: master | Immanuel Thomas <immanuel278 at gmail.com> | Sun Jul 23 15:36:04 2017 -0700| [f78ef697c4b36a4b89a18fcf27cffe15c349da6b] | committer: Geoffrey Métais
Fix sed in compile script for BSD version in Mac
sed in Mac requires extension for backup file.
Signed-off-by: Geoffrey Métais <geoffrey.metais at gmail.com>
> https://code.videolan.org/videolan/vlc-android/commit/f78ef697c4b36a4b89a18fcf27cffe15c349da6b
---
.gitignore | 1 +
compile-libvlc.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index db5febe7e..b684b09b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,5 +65,6 @@ libVLC/build/
#medialibrary build
libvlc.pc
+libvlc.pc.backup
libvlcpp.pc
lib/
diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index 9eaf06d4c..d17afd30e 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -832,7 +832,7 @@ sed "s#@prefix@#${MEDIALIBRARY_MODULE_DIR}/medialibrary/libvlcpp#g" $SRC_DIR/pkg
$SRC_DIR/pkgs/libvlcpp.pc;
sed "s#@libdir@#$SRC_DIR/libvlc/jni/libs/$ANDROID_ABI#g" $SRC_DIR/pkgs/libvlc.pc.in > \
$SRC_DIR/pkgs/libvlc.pc;
-sed -i "s#@includedirs@#-I${SRC_DIR}/vlc/include \
+sed -i".backup" "s#@includedirs@#-I${SRC_DIR}/vlc/include \
-I${SRC_DIR}/vlc/build-android-$TARGET_TUPLE/include#g" $SRC_DIR/pkgs/libvlc.pc;
if [ ! -d "build-android-$ANDROID_ABI/" ]; then
More information about the Android
mailing list