From: Glenn Morris <rgm@gnu.org>
Date: Tue, 23 Oct 2012 17:33:22 +0000 (-0400)
Subject: Revert 2012-10-21 Makefile.in change (bug#12713)
X-Git-Tag: emacs-24.2.90~209^2~103
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/ed68379ea9440ca254eef279047d2e9bfd175e5b

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 362c2adc2d..1a2a80fe39 100644
--- 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 d80496d8b7..5c5d30fb63 100644
--- 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 ; \