From ed68379ea9440ca254eef279047d2e9bfd175e5b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 23 Oct 2012 13:33:22 -0400 Subject: [PATCH] Revert 2012-10-21 Makefile.in change (bug#12713) * Makefile.in (emacs_transform): Remove. (install-man): Revert 2012-10-21 change. --- ChangeLog | 5 +++++ Makefile.in | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 362c2adc2d8..1a2a80fe39c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-10-23 Glenn Morris + + * Makefile.in (emacs_transform): Remove. + (install-man): Revert 2012-10-21 change. (Bug#12713) + 2012-10-21 Glenn Morris * Makefile.in (install-etc): Don't install emacs22 icons. diff --git a/Makefile.in b/Makefile.in index d80496d8b7b..5c5d30fb63f 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 ; \ -- 2.39.2