[vlc-commits] Application icons also always should go to /usr/share

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct  5 23:46:47 2011 +0300| [55bfdd0c9d85ab85d812ed04fa8c40d2ccc2faf9] | committer: Rémi Denis-Courmont

Application icons also always should go to /usr/share

(as far as I know)

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

 share/Makefile.am |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index e21667e..d65a579 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,13 +2,6 @@ CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 EXTRA_DIST =
 
-iconsdatadir = $(datadir)/icons/hicolor/
-icons16dir = $(iconsdatadir)/16x16/apps/
-icons32dir = $(iconsdatadir)/32x32/apps/
-icons48dir = $(iconsdatadir)/48x48/apps/
-icons128dir = $(iconsdatadir)/128x128/apps/
-icons256dir = $(iconsdatadir)/256x256/apps/
-
 appdatadir = /usr/share/applications
 appdata_DATA = vlc.desktop
 EXTRA_DIST += vlc.desktop.in
@@ -18,6 +11,13 @@ vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > $@.tmp
 	$(AM_V_at)mv -f $@.tmp $@
 
+iconsdatadir = /usr/share/icons/hicolor
+icons16dir = $(iconsdatadir)/16x16/apps
+icons32dir = $(iconsdatadir)/32x32/apps
+icons48dir = $(iconsdatadir)/48x48/apps
+icons128dir = $(iconsdatadir)/128x128/apps
+icons256dir = $(iconsdatadir)/256x256/apps
+
 dist_vlcdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \