[vlc-commits] contrib: robustify and fix gsm

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul  4 19:41:08 2011 +0300| [3593c1e878c794f526394fa92fdb3cdf8bf89394] | committer: Rémi Denis-Courmont

contrib: robustify and fix gsm

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3593c1e878c794f526394fa92fdb3cdf8bf89394
---

 contrib/src/ffmpeg/rules.mak |    2 +-
 contrib/src/gsm/rules.mak    |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index c40a9ce..208ff7f 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -9,7 +9,7 @@ FFMPEGCONF = \
 	--cc="$(CC)" \
 	--disable-doc \
 	--disable-decoder=libvpx \
-	--enable-gsm \
+	--enable-libgsm \
 	--disable-debug \
 	--enable-gpl \
 	--enable-postproc \
diff --git a/contrib/src/gsm/rules.mak b/contrib/src/gsm/rules.mak
index 1353354..fddbb42 100644
--- a/contrib/src/gsm/rules.mak
+++ b/contrib/src/gsm/rules.mak
@@ -19,6 +19,7 @@ endif
 
 .gsm: gsm
 	cd $< && $(HOSTVARS) $(MAKE)
-	cd $< && mkdir -p $(PREFIX)/include/gsm && cp inc/gsm.h $(PREFIX)/include/gsm
-	cd $< && cp lib/libgsm.a $(PREFIX)/lib
+	mkdir -p "$(PREFIX)/include/gsm" "$(PREFIX)/lib"
+	cp $</inc/gsm.h "$(PREFIX)/include/gsm"
+	cp $</lib/libgsm.a "$(PREFIX)/lib"
 	touch $@