vlc | branch: master | John Peterson <john.peters...@hotmail.com> | Sun Sep 16 11:48:15 2012 +0200| [e1bb86cdb67c974c526542f3b57c8de51be450f6] | committer: Jean-Baptiste Kempf
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 <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e1bb86cdb67c974c526542f3b57c8de51be450f6 --- 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 00166f9..98b9b64 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -349,7 +349,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/ @@ -359,8 +359,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: _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
