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.

diff --git a/ChangeLog b/ChangeLog
index 81eddade0a03b957d49211eb4835bef60afcdf07..368d4614d9345213df621c859dcf9bb709645275 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.

diff --git a/Makefile.in b/Makefile.in
index c27b67771621ae5383558f1c30f09aaf535e73ab..2f5f78ba41a929875ae56e67176aca6768273d25 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -631,14 +631,17 @@ install-man:
        done
 
 ## Install those items from etc/ that need to end up elsewhere.
+
+# Like EMACS, but without EXEEXT.
+emacs_transform = `echo emacs | sed '$(TRANSFORM)'`
+
 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}/" \
+       sed -e '/^Exec=emacs/ s/emacs/${emacs_transform}/' \
+         -e '/^Icon=emacs/ s/emacs/${emacs_transform}/' \
          ${srcdir}/etc/emacs.desktop > $${tmp}; \
-       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \
+       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${emacs_transform}.desktop; \
        rm -f $${tmp}
        thisdir=`/bin/pwd`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \