vlc | branch: master | Rafaël Carré <[email protected]> | Thu Nov 24 12:58:13 2011 -0500| [17c7666bf05f97ecbdbd5521f9fdbc171ce7d19c] | committer: Rafaël Carré
contrib: remove $(OS) from package/prebuilt > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17c7666bf05f97ecbdbd5521f9fdbc171ce7d19c --- contrib/src/main.mak | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 038bd94..e5af900 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -270,20 +270,12 @@ distclean: clean $(RM) config.mak unlink Makefile -OS= -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 +PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/vlc-contrib-$(HOST)-latest.tar.bz2 -vlc-contrib-$(OS)-$(HOST)-latest.tar.bz2: +vlc-contrib-$(HOST)-latest.tar.bz2: $(call download,$(PREBUILT_URL)) -prebuilt: vlc-contrib-$(OS)-$(HOST)-latest.tar.bz2 +prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2 $(UNPACK) && mv $(HOST) $(TOPDST) cd $(TOPDST)/$(HOST) && ./change_prefix.sh @@ -297,7 +289,7 @@ package: install 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 && 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: @echo All packages: _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
