vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Nov 24 19:39:33 2011 +0200| [b5a99146281eea13d369cdea6a81847f01f353e1] | committer: Rémi Denis-Courmont
Revert "contrib: guess OS automatically, make package will create:" This reverts commit cc8487db61c0b09b992a34aba6b40c02640e72b0. This broke all but two platforms. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b5a99146281eea13d369cdea6a81847f01f353e1 --- contrib/src/main.mak | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index ef5b64a..bfd0d67 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -270,15 +270,7 @@ distclean: clean $(RM) config.mak unlink Makefile -OS= -ifdef HAVE_MACOSX -OS=macosx -endif -ifdef HAVE_WIN32 -OS=win32 -endif - -package: install +package-%: install rm -Rf tmp/ mkdir -p tmp/ cp -r $(PREFIX) tmp/ @@ -288,7 +280,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
