Revert 2012-10-21 Makefile.in change (bug#12713)

* Makefile.in (emacs_transform): Remove.
(install-man): Revert 2012-10-21 change.

diff --git a/ChangeLog b/ChangeLog
index 362c2adc2d8e75ddbd9b38e1ea80539a384d3372..1a2a80fe39c80a59a1b2b86ca1cfd721c1f2ffce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (emacs_transform): Remove.
+       (install-man): Revert 2012-10-21 change.  (Bug#12713)
+
 2012-10-21  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (install-etc): Don't install emacs22 icons.

diff --git a/Makefile.in b/Makefile.in
index d80496d8b7bfa5cad9d97f8c0663202916acb797..5c5d30fb63f7f2156f75016bd7a25d89b04fe5d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -631,17 +631,14 @@ 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/${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 ; \