From 8dc2a723eb0e4387889474d87c2f2b00954ff893 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 20 Oct 2012 18:27:09 -0700 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ Makefile.in | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81eddade0a0..368d4614d93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-10-21 Glenn Morris + + * Makefile.in (emacs_transform): New variable. + (install-etc): Prefer a make variable to a shell variable. + 2012-10-18 Stefan Monnier * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. diff --git a/Makefile.in b/Makefile.in index c27b6777162..2f5f78ba41a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -631,14 +631,17 @@ 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/$${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 ; \ -- 2.39.2