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)

diff --git a/Makefile.in b/Makefile.in
index f5fda0eb61a275b3a959c762cd89f75929c2b06d..0ab34c8be6a8c37777a1c441362a186df65191d6 100644 (file)
--- 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}