From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 15 Apr 2007 13:38:00 +0000 (+0000)
Subject:  - Fix installation of gnome-vlc-default.sh
X-Git-Tag: 0.9.0-test0~7724
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6ea84051e4d72a88e10d0e1370f4b63397e7618b;p=vlc

 - Fix installation of gnome-vlc-default.sh
 - Make the desktop icon execute vlc instead of wxvlc
---

diff --git a/share/Makefile.am b/share/Makefile.am
index d0e8ddaaf3..ee5a236d72 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = $(DIST_rsrc) \
+	applications/vlc.desktop.in \
 	$(skins2_default_vlt_FILES)
 MOSTLYCLEANFILES = $(nobase_pkgdata_DATA)
 
@@ -18,7 +19,8 @@ nobase_dist_pkgdata_DATA = \
 	$(DIST_osdmenu_dvd)
 
 nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_data_DATA = $(DIST_applications)
+nobase_dist_data_DATA = applications/vlc.desktop
+nobase_dist_bin_SCRIPTS = applications/gnome-vlc-default.sh
 
 DIST_rsrc = \
 	newres.h \
@@ -226,7 +228,3 @@ DIST_osdmenu_dvd = \
 	osdmenu/dvd/volume/volume04.png \
 	osdmenu/dvd/volume/volume05.png \
 	osdmenu/dvd/unselect/barroff.png
-
-DIST_applications = \
-	applications/vlc.desktop \
-	applications/gnome-vlc-default.sh
diff --git a/share/applications/vlc.desktop b/share/applications/vlc.desktop
index 15893171ac..ff382316cb 100644
--- a/share/applications/vlc.desktop
+++ b/share/applications/vlc.desktop
@@ -9,7 +9,7 @@ Name[sv]=Mediaspelaren VLC
 Comment[sv]=Allmän uppspelare av film och musik
 Name[ru]=Медиаплеер VLC
 Comment[ru]=Универсальный проигрыватель видео и аудио
-Exec=wxvlc
+Exec=vlc
 Icon=vlc
 Terminal=false
 Type=Application