procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2017-04-13 13:52:09 -04:00
parent 030c4f94b6
commit 900caf992e
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.in
View file

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