procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* Makefile.in (emacs_transform): Remove.
(install-man): Revert 2012-10-21 change.
This commit is contained in:
Glenn Morris 2012-10-23 13:33:22 -04:00
parent 4c77e620ec
commit ed68379ea9
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

11
Makefile.in
View file

@ -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 ; \