From: "Ulrich Müller" <ulm@gentoo.org>
To: 62045@debbugs.gnu.org
Subject: bug#62045: 28.2; sed expression in install-etc does not work
Date: Wed, 08 Mar 2023 08:53:07 +0100 [thread overview]
Message-ID: <u5ybbsmqk@gentoo.org> (raw)
The sed expressions in the install-etc make target don't match the
strings in the two desktop files for emacsclient.
For emacsclient-mail.desktop, this was broken since its inception;
for emacsclient.desktop, it is broken since commit cbf220bc31c0, where
the shell wrapper was added.
A trivial patch is included below. Should it be installed on emacs-29,
or on master?
----- 8< -----
From b6365f386474132a16585c566675cda94f1226d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Wed, 8 Mar 2023 08:25:49 +0100
Subject: [PATCH] Fix sed expression in install-etc make target
* Makefile.in (install-etc): Fix sed expression for emacsclient
desktop files.
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 2fb7754d683..4f2f2f15c97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -841,7 +841,7 @@ install-etc:
rm -f $${tmp}
tmp=etc/emacsclient.tmpdesktop; rm -f $${tmp}; \
client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
- sed -e "/^Exec=emacsclient/ s|emacsclient|${bindir}/$${client_name}|" \
+ sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
$(USE_STARTUP_NOTIFICATION_SED_CMD) \
${srcdir}/etc/emacsclient.desktop > $${tmp}; \
@@ -855,7 +855,7 @@ install-etc:
rm -f $${tmp}
tmp=etc/emacsclient-mail.tmpdesktop; rm -f $${tmp}; \
client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \
- sed -e "/^Exec=emacsclient/ s|emacsclient|${bindir}/$${client_name}|" \
+ sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \
-e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \
${srcdir}/etc/emacsclient-mail.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}-mail.desktop"; \
--
2.39.2
next reply other threads:[~2023-03-08 7:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 7:53 Ulrich Müller [this message]
2023-03-08 13:52 ` bug#62045: 28.2; sed expression in install-etc does not work Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=u5ybbsmqk@gentoo.org \
--to=ulm@gentoo.org \
--cc=62045@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.