[vlc-commits] Revert "Revert "contrib: guess OS automatically, make package will create:" "

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov 24 12:47:01 2011 -0500| [805254a203b1f2a181b525296783350fde000810] | committer: Rafaël Carré

Revert "Revert "contrib: guess OS automatically, make package will create:""

This reverts commit b5a99146281eea13d369cdea6a81847f01f353e1.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=805254a203b1f2a181b525296783350fde000810
---

 contrib/src/main.mak |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index bfd0d67..ef5b64a 100644
--- 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: