From: Glenn Morris <rgm@gnu.org>
Date: Thu, 13 Apr 2017 17:52:09 +0000 (-0400)
Subject: * Makefile.in (install-etc): Use existing Makefile variables.
X-Git-Tag: emacs-26.0.90~521^2~637
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=900caf992e5686778e22e6f6e839bdd58b75c271;p=emacs.git

* Makefile.in (install-etc): Use existing Makefile variables.
---

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"; \