[vlc-commits] Do not hard-code prefixed path for desktop entry (fix make dist)

Rémi Denis-Courmont git at videolan.org
Fri Oct 7 22:21:40 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Oct  7 23:17:20 2011 +0300| [7341b013184d21cdccf77f961c8713d53df615dc] | committer: Rémi Denis-Courmont

Do not hard-code prefixed path for desktop entry (fix make dist)

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

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

diff --git a/share/Makefile.am b/share/Makefile.am
index 6c676cd..bd6282c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES = skins2/default.vlt
 MOSTLYCLEANFILES =
 EXTRA_DIST =
 
-appdatadir = /usr/share/applications
+appdatadir = $(datadir)/applications
 if !HAVE_WIN32
 appdata_DATA = vlc.desktop
 endif
@@ -13,7 +13,7 @@ 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
+iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
 icons32dir = $(iconsdatadir)/32x32/apps
 icons48dir = $(iconsdatadir)/48x48/apps



More information about the vlc-commits mailing list