[vlc-commits] Validate the .desktop file with desktop-utils where available

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 11 19:19:44 2011 +0300| [4a80a51aa7a5dd01dfff9fbd4d7545daae267ec7] | committer: Rémi Denis-Courmont

Validate the .desktop file with desktop-utils where available

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

 configure.ac      |    3 +++
 share/Makefile.am |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6cdb98a..8c034a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,9 @@ AC_CHECK_TOOL(AR, ar, :)
 AC_CHECK_TOOL(LD, ld, :)
 AC_CHECK_TOOL(DLLTOOL, dlltool, :)
 
+AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files])
+AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :)
+
 dnl Check for compiler properties
 AC_C_CONST
 AC_C_INLINE
diff --git a/share/Makefile.am b/share/Makefile.am
index ad822ad..3df6f55 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -10,8 +10,9 @@ EXTRA_DIST += vlc.desktop.in
 CLEANFILES += $(appdata_DATA)
 
 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 $@
+	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
+	$(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+	$(AM_V_at)mv -f tmp-$@ $@
 
 iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps