Commit 8dc2a723 authored by Glenn Morris's avatar Glenn Morris

In Makefile.in, use a make variable rather than a shell variable.

* Makefile.in (emacs_transform): New variable.
(install-etc): Prefer a make variable to a shell variable.
parent ee7a418d
2012-10-21 Glenn Morris <rgm@gnu.org>
* Makefile.in (emacs_transform): New variable.
(install-etc): Prefer a make variable to a shell variable.
2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca> 2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
......
...@@ -631,14 +631,17 @@ install-man: ...@@ -631,14 +631,17 @@ install-man:
done done
## Install those items from etc/ that need to end up elsewhere. ## Install those items from etc/ that need to end up elsewhere.
# Like EMACS, but without EXEEXT.
emacs_transform = `echo emacs | sed '$(TRANSFORM)'`
install-etc: install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
dest=`echo emacs | sed '$(TRANSFORM)'`; \
tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \ sed -e '/^Exec=emacs/ s/emacs/${emacs_transform}/' \
-e "/^Icon=emacs/ s/emacs/$${dest}/" \ -e '/^Icon=emacs/ s/emacs/${emacs_transform}/' \
${srcdir}/etc/emacs.desktop > $${tmp}; \ ${srcdir}/etc/emacs.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \ ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${emacs_transform}.desktop; \
rm -f $${tmp} rm -f $${tmp}
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
cd ${iconsrcdir} || exit 1; umask 022 ; \ cd ${iconsrcdir} || exit 1; umask 022 ; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment