diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-13 13:52:09 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-13 13:56:02 -0400 |
| commit | 900caf992e5686778e22e6f6e839bdd58b75c271 (patch) | |
| tree | 9eff0b7657fdd1b61079b06ddf567604120567b0 /Makefile.in | |
| parent | 030c4f94b630f8ca925ad59e814dc1f4fa69cfe3 (diff) | |
| download | emacs-900caf992e5686778e22e6f6e839bdd58b75c271.tar.gz | |
* Makefile.in (install-etc): Use existing Makefile variables.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 06909c34445..1b41205057d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -694,9 +694,8 @@ EMACS_ICON=emacs install-etc: umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}" tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ - emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \ - sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \ - -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \ + sed -e "/^Exec=emacs/ s/emacs/${EMACS_NAME}/" \ + -e "/^Icon=emacs/ s/emacs/${EMACS_NAME}/" \ ${srcdir}/etc/emacs.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \ rm -f $${tmp} @@ -708,12 +707,10 @@ install-etc: rm -f $${tmp} umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" tmp=etc/emacs.tmpservice; rm -f $${tmp}; \ - emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \ - exe_name=$${emacs_name}${EXEEXT}; \ client_name=`echo emacsclient | sed '$(TRANSFORM)'`${EXEEXT}; \ sed -e '/^##/d' \ - -e "/^Documentation/ s/emacs(1)/$${emacs_name}(1)/" \ - -e "/^ExecStart/ s|emacs|${bindir}/$${exe_name}|" \ + -e "/^Documentation/ s/emacs(1)/${EMACS_NAME}(1)/" \ + -e "/^ExecStart/ s|emacs|${bindir}/${EMACS}|" \ -e "/^ExecStop/ s|emacsclient|${bindir}/$${client_name}|" \ ${srcdir}/etc/emacs.service > $${tmp}; \ $(INSTALL_DATA) $${tmp} "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"; \ |