[vlc-devel] commit: Don't use a directory for a lone file (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Tue Feb 23 00:49:49 2010 +0000| [88b84dbe29d5a8217ac7988dec9d7b2ed9bf25d4] | committer: Christophe Mutricy 

Don't use a directory for a lone file

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

 share/Makefile.am                    |   28 +++++++++-------------------
 share/{applications => }/vlc.desktop |    0 
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 746a391..83bcc1d 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,6 +1,8 @@
 CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 
+appdatadir = $(datadir)/applications/
+
 iconsdatadir = $(datadir)/icons/hicolor/
 icons16dir = $(iconsdatadir)/16x16/apps/
 icons32dir = $(iconsdatadir)/32x32/apps/
@@ -8,14 +10,14 @@ icons48dir = $(iconsdatadir)/48x48/apps/
 icons128dir = $(iconsdatadir)/128x128/apps/
 icons256dir = $(iconsdatadir)/256x256/apps/
 
-nobase_dist_data_DATA = applications/vlc.desktop
+dist_appdata_DATA = vlc.desktop
 
-dist_vlcdata_DATA = $(DIST_icons)
-dist_icons16_DATA = $(DIST_icons16)
-dist_icons32_DATA = $(DIST_icons32)
-dist_icons48_DATA = $(DIST_icons48)
-dist_icons128_DATA = $(DIST_icons128)
-dist_icons256_DATA = $(DIST_icons256)
+dist_vlcdata_DATA = vlc.ico
+dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
+dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
+dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
+dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
+dist_icons256_DATA = vlc256x256.png
 
 nobase_dist_vlcdata_SCRIPTS = \
 	utils/gnome-vlc-default.sh \
@@ -60,18 +62,6 @@ DIST_rsrc = \
 	vlc_wince_rc.rc \
 	vlc_beos.rsrc
 
-DIST_icons = vlc.ico
-
-DIST_icons16 = vlc16x16.png vlc16x16.xpm
-
-DIST_icons32 = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
-
-DIST_icons48 = vlc48x48.png vlc48x48-christmas.png
-
-DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
-
-DIST_icons256 = vlc256x256.png
-
 DIST_skins2 = \
 	skins2/fonts/FreeSans.ttf \
 	skins2/fonts/FreeSansBold.ttf \
diff --git a/share/applications/vlc.desktop b/share/vlc.desktop
similarity index 100%
rename from share/applications/vlc.desktop
rename to share/vlc.desktop