[Emacs-diffs] /srv/bzr/emacs/trunk r110637: Revert 2012-10-21 Makefile.in change (bug#12713)

[Glenn Morris]

------------------------------------------------------------
revno: 110637
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-23 13:33:22 -0400
message:
  Revert 2012-10-21 Makefile.in change (bug#12713)
  
  * Makefile.in (emacs_transform): Remove.
  (install-man): Revert 2012-10-21 change.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-21 01:35:46 +0000
+++ b/ChangeLog 2012-10-23 17:33:22 +0000
@@ -1,3 +1,8 @@
+2012-10-23  Glenn Morris  <address@hidden>
+
+       * Makefile.in (emacs_transform): Remove.
+       (install-man): Revert 2012-10-21 change.  (Bug#12713)
+
 2012-10-21  Glenn Morris  <address@hidden>
 
        * Makefile.in (install-etc): Don't install emacs22 icons.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-10-21 01:35:46 +0000
+++ b/Makefile.in       2012-10-23 17:33:22 +0000
@@ -631,17 +631,14 @@
        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/${emacs_transform}/' \
-         -e '/^Icon=emacs/ s/emacs/${emacs_transform}/' \
+       sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \
+         -e "/^Icon=emacs/ s/emacs/$${dest}/" \
          ${srcdir}/etc/emacs.desktop > $${tmp}; \
-       ${INSTALL_DATA} $${tmp} 
$(DESTDIR)${desktopdir}/${emacs_transform}.desktop; \
+       ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \
        rm -f $${tmp}
        thisdir=`/bin/pwd`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \