[vlc-commits] contrib: postfix directories with a slash in cp

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul  4 23:48:59 2011 +0300| [a2a2275b4de505387a27a90e1f624bf340fad3ad] | committer: Rémi Denis-Courmont

contrib: postfix directories with a slash in cp

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

 contrib/src/directx/rules.mak    |    2 +-
 contrib/src/fontconfig/rules.mak |    2 +-
 contrib/src/gsm/rules.mak        |    4 ++--
 contrib/src/live555/rules.mak    |    4 ++--
 contrib/src/lua/rules.mak        |    2 +-
 contrib/src/vpx/rules.mak        |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
index 654c8b2..1739994 100644
--- a/contrib/src/directx/rules.mak
+++ b/contrib/src/directx/rules.mak
@@ -18,5 +18,5 @@ $(TARBALLS)/dxva2api.h:
 .directx: directx-oss.tar.bz2 dxva2api.h .sum-directx
 	mkdir -p -- "$(PREFIX)/include"
 	tar xvjf $< -C "$(PREFIX)/include"
-	cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include"
+	cp $(TARBALLS)/dxva2api.h "$(PREFIX)/include/"
 	touch $@
diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak
index 1ccb61c..59b5717 100644
--- a/contrib/src/fontconfig/rules.mak
+++ b/contrib/src/fontconfig/rules.mak
@@ -61,6 +61,6 @@ else
 	cd $< && $(MAKE) install-exec
 	cd $</fontconfig && $(MAKE) install-data
 	sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la
-	cp $</fontconfig.pc $(PREFIX)/lib/pkgconfig
+	cp $</fontconfig.pc $(PREFIX)/lib/pkgconfig/
 endif
 	touch $@
diff --git a/contrib/src/gsm/rules.mak b/contrib/src/gsm/rules.mak
index fddbb42..99d72c4 100644
--- a/contrib/src/gsm/rules.mak
+++ b/contrib/src/gsm/rules.mak
@@ -20,6 +20,6 @@ endif
 .gsm: gsm
 	cd $< && $(HOSTVARS) $(MAKE)
 	mkdir -p "$(PREFIX)/include/gsm" "$(PREFIX)/lib"
-	cp $</inc/gsm.h "$(PREFIX)/include/gsm"
-	cp $</lib/libgsm.a "$(PREFIX)/lib"
+	cp $</inc/gsm.h "$(PREFIX)/include/gsm/"
+	cp $</lib/libgsm.a "$(PREFIX)/lib/"
 	touch $@
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 330b833..f6e9392 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -54,12 +54,12 @@ endif
 		$</liveMedia/libliveMedia.a \
 		$</UsageEnvironment/libUsageEnvironment.a \
 		$</BasicUsageEnvironment/libBasicUsageEnvironment.a \
-		"$(PREFIX)/lib"
+		"$(PREFIX)/lib/"
 	cp \
 		$</groupsock/include/*.hh \
 		$</groupsock/include/*.h \
 		$</liveMedia/include/*.hh \
         	$</UsageEnvironment/include/*.hh \
         	$</BasicUsageEnvironment/include/*.hh \
-		"$(PREFIX)/include"
+		"$(PREFIX)/include/"
 	touch $@
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index 3bf9a38..9dfbe87 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -57,6 +57,6 @@ endif
 ifdef HAVE_WIN32
 	cd $< && $(RANLIB) "$(PREFIX)/lib/liblua.a"
 	mkdir -p -- "$(PREFIX)/lib/pkgconfig"
-	cp $</etc/lua.pc "$(PREFIX)/lib/pkgconfig"
+	cp $</etc/lua.pc "$(PREFIX)/lib/pkgconfig/"
 endif
 	touch $@
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 3925ad2..370ea0b 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -78,7 +78,7 @@ endif
 	rm -Rf -- "$(PREFIX)/include/vpx/"
 	mkdir -p -- "$(PREFIX)/include/vpx/"
 	# Of course! Why the hell would it be listed or in make install?
-	cp $</vpx/*.h $</vpx_ports/*.h "$(PREFIX)/include/vpx"
+	cp $</vpx/*.h $</vpx_ports/*.h "$(PREFIX)/include/vpx/"
 	rm -f -- "$(PREFIX)/include/vpx/config.h"
 	$(RANLIB) $</libvpx.a
 	# Of course! Why the hell would it be listed or in make install?