Commit e1bb86cd authored by John Peterson's avatar John Peterson Committed by Jean-Baptiste Kempf

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: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent a38092cd
......@@ -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:
......
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