]> git.eshelyaron.com Git - emacs.git/commitdiff
Substitute all emacsclient occurrences in emacsclient.desktop
authorLin Jian <me@linj.tech>
Mon, 29 Jan 2024 22:11:26 +0000 (06:11 +0800)
committerEshel Yaron <me@eshelyaron.com>
Wed, 12 Feb 2025 10:52:44 +0000 (11:52 +0100)
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

index cbb6f26fb77b95907b3866186a2ec4b5814d9493..7bf8f266e422721298f0910032d57d1352eaab8f 100644 (file)
@@ -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) \