[Emacs-diffs] /srv/bzr/emacs/trunk r110609: In Makefile.in, use a make variable rather than a shell variable.

[Glenn Morris]

------------------------------------------------------------
revno: 110609
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-20 18:27:09 -0700
message:
  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.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-19 19:25:18 +0000
+++ b/ChangeLog 2012-10-21 01:27:09 +0000
@@ -1,3 +1,8 @@
+2012-10-21  Glenn Morris  <address@hidden>
+
+       * Makefile.in (emacs_transform): New variable.
+       (install-etc): Prefer a make variable to a shell variable.
+
 2012-10-18  Stefan Monnier  <address@hidden>
 
        * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-10-18 12:56:10 +0000
+++ b/Makefile.in       2012-10-21 01:27:09 +0000
@@ -631,14 +631,17 @@
        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 ; \