Commit 5c205a30 authored by John Peterson's avatar John Peterson Committed by Rafaël Carré

Fixing contrib 'make prebuilt' and 'make package' to use the repo version of...

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: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit e1bb86cdb67c974c526542f3b57c8de51be450f6)
Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent 76c37c46
...@@ -335,7 +335,7 @@ vlc-contrib-$(HOST)-latest.tar.bz2: ...@@ -335,7 +335,7 @@ vlc-contrib-$(HOST)-latest.tar.bz2:
prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2 prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
$(UNPACK) && mv $(HOST) $(TOPDST) $(UNPACK) && mv $(HOST) $(TOPDST)
cd $(TOPDST)/$(HOST) && ./change_prefix.sh cd $(TOPDST)/$(HOST) && $(SRC)/change_prefix.sh
package: install package: install
rm -Rf tmp/ rm -Rf tmp/
...@@ -345,8 +345,7 @@ package: install ...@@ -345,8 +345,7 @@ package: install
cd tmp/$(notdir $(PREFIX)); \ cd tmp/$(notdir $(PREFIX)); \
cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \ cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
rm -Rf man sbin etc lib/lua lib/sidplay rm -Rf man sbin etc lib/lua lib/sidplay
cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/ cd tmp/$(notdir $(PREFIX)) && $(abspath $(SRC))/change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
cd tmp/$(notdir $(PREFIX)) && ./change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
(cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2 (cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
list: list:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment