mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

* Makefile.in (EMACS_NAME): New variable.

Browse Source 
(EMACS, install-etc, uninstall): Use $EMACS_NAME.
This commit is contained in:
Glenn Morris 2012-10-26 14:35:36 -04:00
parent 150f809c34
commit 59696ae01c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2012-10-26 Glenn Morris <rgm@gnu.org>
* Makefile.in (EMACS_NAME): New variable.
(EMACS, install-etc, uninstall): Use $EMACS_NAME.
* Makefile.in (EMACS, EMACSFULL): Transformations should not be
applied to $EXEEXT.

17
Makefile.in
View File

@ -259,7 +259,8 @@ GZIP_INFO = @GZIP_INFO@
TRANSFORM = @program_transform_name@
# What emacs should be called when installed.
EMACS = `echo emacs | sed '$(TRANSFORM)'`${EXEEXT}
EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'`
EMACS = ${EMACS_NAME}${EXEEXT}
EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
# Subdirectories to make recursively.
@ -633,12 +634,12 @@ install-man:
## Install those items from etc/ that need to end up elsewhere.
install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
dest=`echo emacs | sed '$(TRANSFORM)'`; \
tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \
-e "/^Icon=emacs/ s/emacs/$${dest}/" \
emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \
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}/$${dest}.desktop; \
${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \
rm -f $${tmp}
thisdir=`/bin/pwd`; \
cd ${iconsrcdir} || exit 1; umask 022 ; \
@ -702,11 +703,11 @@ uninstall:
fi)
(cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
(if cd $(DESTDIR)${icondir}; then \
rm -f hicolor/*x*/apps/`echo emacs | sed '$(TRANSFORM)'`.png \
hicolor/scalable/apps/`echo emacs | sed '$(TRANSFORM)'`.svg \
rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
hicolor/scalable/apps/${EMACS_NAME}.svg \
hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
fi)
-rm -f $(DESTDIR)${desktopdir}/`echo emacs | sed '$(TRANSFORM)'`.desktop
-rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop
for file in snake-scores tetris-scores; do \
file=$(DESTDIR)${gamedir}/$${file}; \
[ -s $${file} ] || rm -f $$file; \