* bug#62045: 28.2; sed expression in install-etc does not work
@ 2023-03-08 7:53 Ulrich Müller
2023-03-08 13:52 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Ulrich Müller @ 2023-03-08 7:53 UTC (permalink / raw)
To: 62045
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#62045: 28.2; sed expression in install-etc does not work
2023-03-08 7:53 bug#62045: 28.2; sed expression in install-etc does not work Ulrich Müller
@ 2023-03-08 13:52 ` Eli Zaretskii
0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2023-03-08 13:52 UTC (permalink / raw)
To: Ulrich Müller; +Cc: 62045
> From: Ulrich Müller <ulm@gentoo.org>
> Date: Wed, 08 Mar 2023 08:53:07 +0100
>
> 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?
On emacs-29, of course.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-08 13:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-08 7:53 bug#62045: 28.2; sed expression in install-etc does not work Ulrich Müller
2023-03-08 13:52 ` Eli Zaretskii
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.