From 23b7fc05a9826e12e2568efe4ddd8d4ecf7c4a2c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 2 Jul 2013 17:07:20 +0200 Subject: [PATCH] Update linphone submodule. --- Makefile | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2784a9f26..941f263f5 100644 --- a/Makefile +++ b/Makefile @@ -84,8 +84,8 @@ prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h prepare-mediastreamer2: @cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/$$$$builddir/./'` && \ - eval `cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/$$$$builddir/./'` && \ + eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/\$$(abs_builddir)/./'` && \ + eval `cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/\$$(abs_builddir)/./'` && \ if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \ if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi diff --git a/submodules/linphone b/submodules/linphone index 3bff0cef8..5dbfc1d3e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3bff0cef821cf8f8c42fc78aa30917469d7bf0b2 +Subproject commit 5dbfc1d3e1426b6f805f890c850df73ed97381ad