[vlc-commits] share: fix vlc.desktop build output

Rémi Denis-Courmont git at videolan.org
Tue Sep 20 19:30:09 CEST 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep 20 20:29:53 2016 +0300| [701f11e49c0214624d653086aa5dbd6a0caad5d2] | committer: Rémi Denis-Courmont

share: fix vlc.desktop build output

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

 share/Makefile.am | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index b2ec200..5d1291c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -16,9 +16,10 @@ EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
 CLEANFILES += $(desktop_DATA) $(appdata_DATA)
 
 vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
-	$(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' $(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; sed -e "s,\@MIMETYPES\@,$$mimetypes,g" < tmp-$@ > tmp2-$@
-	$(AM_V_at)mv -f tmp2-$@ tmp-$@
+	$(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' $(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; \
+	sed \
+		-e 's,\@bindir\@,$(bindir),g' \
+		 -e "s,\@MIMETYPES\@,$$mimetypes,g" < "$<" > tmp-$@
 	$(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
 	$(AM_V_at)mv -f tmp-$@ $@
 



More information about the vlc-commits mailing list