contrib: guess OS automatically, make package will create:

vlc-contrib-$(OS)-$(HOST)-$(DATE).tar.bz2

where OS = macosx/win32
HOST=x86_64-apple-darwin10 / i686-apple-darwin9 / i586-mingw32-msvc / x86_64-w64-mingw32 ...

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index bfd0d67cc2955f855bd848c7370cc44d82a5903f..ef5b64a30b66fd91d0adc28ea6b33a1edf0834c4 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -270,7 +270,15 @@ distclean: clean
        $(RM) config.mak
        unlink Makefile
 
-package-%: install
+OS=
+ifdef HAVE_MACOSX
+OS=macosx
+endif
+ifdef HAVE_WIN32
+OS=win32
+endif
+
+package: install
        rm -Rf tmp/
        mkdir -p tmp/
        cp -r $(PREFIX) tmp/
@@ -280,7 +288,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-$*-$(HOST)-$(DATE).tar.bz2
+       (cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(OS)-$(HOST)-$(DATE).tar.bz2
 
 list:
        @echo All packages: