vlc/vlc-3.0 | branch: master | Marvin Scholz <[email protected]> | Tue Oct 22 11:46:37 2019 +0200| [2558d525122d147bd7702b3b67e96612a6a9956a] | committer: Steve Lhomme
contrib: use HOST for prebuilt folder name This is what the contrib system expects when unpacking the prebuilt again as it has no way to know the PREFIX that was used when the prebuilt package was created. (cherry picked from commit f9cb16381ea2783ee456e536e66e338af81b6de2) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2558d525122d147bd7702b3b67e96612a6a9956a --- contrib/src/main.mak | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index d6fdeb8402..0fa14b8322 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -478,8 +478,8 @@ vlc-contrib-$(HOST)-latest.tar.bz2: prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2 $(RM) -r $(PREFIX) -$(UNPACK) - mv $(HOST) $(TOPDST) - cd $(PREFIX) && $(SRC)/change_prefix.sh + mv $(HOST) $(PREFIX) + cd $(PREFIX) && $(abspath $(SRC))/change_prefix.sh ifdef HAVE_WIN32 ifndef HAVE_CROSS_COMPILE $(RM) `find $(PREFIX)/bin | file -f- | grep ELF | awk -F: '{print $$1}' | xargs` @@ -495,7 +495,10 @@ package: install cd share; rm -Rf man doc gtk-doc info lua projectM; cd ..; \ rm -Rf man sbin etc lib/lua lib/sidplay 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 +ifneq ($(notdir $(PREFIX)),$(HOST)) + (cd tmp && mv $(notdir $(PREFIX)) $(HOST)) +endif + (cd tmp && tar c $(HOST)/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2 list: @echo All packages: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
