diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-10-23 13:33:22 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-10-23 13:33:22 -0400 |
| commit | ed68379ea9440ca254eef279047d2e9bfd175e5b (patch) | |
| tree | b6a1485599c0a5a199b51e5ae87caaaa481eee32 /Makefile.in | |
| parent | 4c77e620ecb1dc8ef5eb695133541812724bcea8 (diff) | |
| download | emacs-ed68379ea9440ca254eef279047d2e9bfd175e5b.tar.gz | |
Revert 2012-10-21 Makefile.in change (bug#12713)
* Makefile.in (emacs_transform): Remove.
(install-man): Revert 2012-10-21 change.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
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 ; \ |