From 0c31192a6c2998f268ba306922dc0f4080e8a36b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 30 Jan 2024 06:11:26 +0800 Subject: [PATCH] Substitute all emacsclient occurrences in emacsclient.desktop After commit "From .desktop files, reuse a frame or start a new Emacs as required" on 2021-06-30, there are two emacsclient occurrences for the Exec key of etc/emacsclient.desktop. Before this change, only the first occurrence is substituted. * Makefile.in (install-etc): Substitute all emacsclient occurrences in emacsclient.desktop. (Bug#68803) Copyright-paperwork-exempt: yes (cherry picked from commit a73a1e00523c55942b953b55c3baaeb335e07e45) --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index cbb6f26fb77..7bf8f266e42 100644 --- a/Makefile.in +++ b/Makefile.in @@ -859,7 +859,7 @@ install-etc: rm -f $${tmp} tmp=etc/emacsclient.tmpdesktop; rm -f $${tmp}; \ client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \ - sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \ + sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|g" \ -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ $(USE_STARTUP_NOTIFICATION_SED_CMD) \ $(USE_WAYLAND_DISPLAY_SED_CMD) \ -- 2.39.5