[vlc-commits] Revert "share: do not use sed -i"

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


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep 20 20:12:01 2016 +0300| [a65b21c9e123d75227f2d0719edd29c6d1f2309a] | committer: Rémi Denis-Courmont

Revert "share: do not use sed -i"

This reverts commit 6bdf7629fff751b1c5f3eb6214a7aca92bbd8e44.

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

 share/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/Makefile.am b/share/Makefile.am
index 1ae4923..e404f2c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -17,7 +17,7 @@ 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-$@
+	$(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' $(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; sed -i "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