diff options
author | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
---|---|---|
committer | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
commit | 46e7613ad3b88807d25cfab3d78bf46c9e2fe13e (patch) | |
tree | a7b560c36e097660536697c9d0057c9273d779b2 /Makefile.in | |
parent | f6502f959253b8f705e324e137c2933c5a668f62 (diff) | |
parent | e9eafd22681b8e95d8d642def0512d9290564206 (diff) | |
download | emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.gz |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 2f6a68fd9d7..f28623ef565 100644 --- a/Makefile.in +++ b/Makefile.in @@ -715,6 +715,13 @@ install-etc: ${srcdir}/etc/emacs.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \ 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}|" \ + -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ + ${srcdir}/etc/emacsclient.desktop > $${tmp}; \ + ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \ + rm -f $${tmp} umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}" tmp=etc/emacs.tmpappdata; rm -f $${tmp}; \ sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \ |