Skip to content

V
vlc
Commit 17c7666b authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contrib: remove $(OS) from package/prebuilt

parent 7011b14f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
contrib/src/main.mak
View file @ 17c7666b
...@@ -270,20 +270,12 @@ distclean: clean ...@@ -270,20 +270,12 @@ distclean: clean
$(RM) config.mak $(RM) config.mak
unlink Makefile unlink Makefile
OS= PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/vlc-contrib-$(HOST)-latest.tar.bz2
ifdef HAVE_MACOSX
OS=macosx
endif
ifdef HAVE_WIN32
OS=win32
endif
PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/$(OS)/vlc-contrib-$(OS)-$(HOST)-latest.tar.bz2
vlc-contrib-$(OS)-$(HOST)-latest.tar.bz2: vlc-contrib-$(HOST)-latest.tar.bz2:
$(call download,$(PREBUILT_URL)) $(call download,$(PREBUILT_URL))
prebuilt: vlc-contrib-$(OS)-$(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) && ./change_prefix.sh
...@@ -297,7 +289,7 @@ package: install ...@@ -297,7 +289,7 @@ package: install
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))/ cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/
cd tmp/$(notdir $(PREFIX)) && ./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-$(OS)-$(HOST)-$(DATE).tar.bz2 (cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
list: list:
@echo All packages: @echo All packages:
......
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