diff options
| author | Davide Masserut <dm@mssdvd.com> | 2023-08-24 18:33:39 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-15 14:31:10 +0300 |
| commit | 6fe11b88ed044f08680a174ce1b7677b1a5d9be1 (patch) | |
| tree | a8d868eec21b4cbebc89f94dd246ec227cce9315 /Makefile.in | |
| parent | 2fc7463c0e5de1d57e0641e91616f9ffc0d663de (diff) | |
| download | emacs-6fe11b88ed044f08680a174ce1b7677b1a5d9be1.tar.gz | |
Avoid using --display in emacsclient to reuse frames on PGTK
Using hard-coded display values can cause PGTK graphical frames to
open using the wrong backend or not open at all.
* Makefile.in (install-etc): Use --reuse-frame instead of
--display=$DISPLAY. (Bug#65509)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index f5fda0eb61a..0ab34c8be6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -830,6 +830,9 @@ EMACS_ICON=emacs ifeq (${USE_STARTUP_NOTIFICATION},no) USE_STARTUP_NOTIFICATION_SED_CMD=-e "/^StartupNotify=true$$/d" endif +ifeq ($(HAVE_PGTK),yes) +USE_WAYLAND_DISPLAY_SED_CMD=-e "s/display=[^ ]*/reuse-frame/" +endif install-etc: umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}" tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ @@ -844,6 +847,7 @@ install-etc: sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \ -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ $(USE_STARTUP_NOTIFICATION_SED_CMD) \ + $(USE_WAYLAND_DISPLAY_SED_CMD) \ ${srcdir}/etc/emacsclient.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \ rm -f $${tmp} @@ -857,6 +861,7 @@ install-etc: client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \ sed -e "/^Exec=/ s|emacsclient|${bindir}/$${client_name}|" \ -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ + $(USE_WAYLAND_DISPLAY_SED_CMD) \ ${srcdir}/etc/emacsclient-mail.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}-mail.desktop"; \ rm -f $${tmp} |