[vlc-commits] Fixing contrib 'make prebuilt' and 'make package' to use the repo version of change_prefix. sh instead of a version inside the contrib package.

[John Peterson]

vlc/vlc-2.0 | branch: master | John Peterson <john.peterson3 at hotmail.com> | Sun Sep 16 11:48:15 2012 +0200| [5c205a304c34dcfa911d1294a3ca8b9e1520c4c6] | committer: Rafaël Carré

Fixing contrib 'make prebuilt' and 'make package' to use the repo version of change_prefix.sh instead of a version inside the contrib package.

The script shouldn't be included in the contrib package because the intention has not been to have different versions of the file depending on platform. If necessary the script can take into account differences between platforms instead of coming in different versions.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit e1bb86cdb67c974c526542f3b57c8de51be450f6)

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/main.mak |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 50abc1f..70f4a5c 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -335,7 +335,7 @@ vlc-contrib-$(HOST)-latest.tar.bz2:
 
 prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
 	$(UNPACK) && mv $(HOST) $(TOPDST)
-	cd $(TOPDST)/$(HOST) && ./change_prefix.sh
+	cd $(TOPDST)/$(HOST) && $(SRC)/change_prefix.sh
 
 package: install
 	rm -Rf tmp/
@@ -345,8 +345,7 @@ package: install
 	cd tmp/$(notdir $(PREFIX)); \
 		cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
 		rm -Rf man sbin etc lib/lua lib/sidplay
-	cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/
-	cd tmp/$(notdir $(PREFIX)) && ./change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
+	cd tmp/$(notdir $(PREFIX)) && $(abspath $(SRC))/change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
 
 list: