- 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 d0e8ddaaf3839548b73979cba6cd6cd0c16f945d..ee5a236d72bfbe080b622fbea4cb29e5d71901ca 100644 (file)
--- 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 15893171acf2e64198a7082b9037318077ff6d84..ff382316cb4fd12dbc54109ca44b49ac939f0477 100644 (file)
--- 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