[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 900caf9: * Makefile.in (install-etc): Use existing
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 900caf9: * Makefile.in (install-etc): Use existing Makefile variables. |
Date: |
Thu, 13 Apr 2017 13:56:14 -0400 (EDT) |
branch: master
commit 900caf992e5686778e22e6f6e839bdd58b75c271
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* Makefile.in (install-etc): Use existing Makefile variables.
---
Makefile.in | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 06909c3..1b41205 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"; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 900caf9: * Makefile.in (install-etc): Use existing Makefile variables.,
Glenn Morris <=