[Android] [PATCH] Fix sed in compile script for BSD version in Mac

[Geoffrey Métais]

LGTM
Le lun. 24 juil. 2017 à 00:36, Immanuel Thomas <immanuel278 at gmail.com> a
écrit :

> sed in Mac requires extension for backup file.
> ---
>  .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
> --
> 2.13.3
>
> _______________________________________________
> Android mailing list
> Android at videolan.org
> https://mailman.videolan.org/listinfo/android
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/android/attachments/20170724/7d1974a3/attachment.html>