bug#12536: 24.2.50; Outdated emacs22 icons in repo

[Glenn Morris <rgm@gnu.org>]

David De La Harpe Golden wrote:

> Well, I've used the emacs22 icon since the change, but I suppose I am
> fully capable of keeping my own copy if I want it. Or I could use the
> new emacs icon if I just changed iceweasel etc. instead, just so long
> as I don't have to juggle quite so many blue crystal spheres,
> grumble...

 It's trivial (one-line patch) to put back the emacs22 icons, just not
 install them.
 It's only fractionally less trivial (three-line patch) to also allow
 choice of icon at install time:


*** Makefile.in	2012-10-15 21:57:20 +0000
--- Makefile.in	2012-10-15 23:54:13 +0000
***************
*** 631,636 ****
--- 631,640 ----
  	done
  
  ## Install those items from etc/ that need to end up elsewhere.
+ 
+ ## Choose "emacs" or "emacs22" at installation time.
+ ## Note: emacs22 does not have all the resolutions.
+ EMACS_ICON=emacs
  install-etc:
  	umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
  	dest=`echo emacs | sed '$(TRANSFORM)'`; \
***************
*** 645,653 ****
  	for dir in */*/apps */*/mimetypes; do \
  	  [ -d $${dir} ] || continue ; \
  	  ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
! 	  for icon in $${dir}/*.*; do \
  	    [ -r $${icon} ] || continue ; \
! 	    dest=`echo "$${icon}" | sed -e 's|.*/||' -e '$(TRANSFORM)'` ; \
  	    ( cd $${thisdir}; \
  	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
  	    || exit 1; \
--- 649,657 ----
  	for dir in */*/apps */*/mimetypes; do \
  	  [ -d $${dir} ] || continue ; \
  	  ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
! 	  for icon in $${dir}/${EMACS_ICON}[.-]*; do \
  	    [ -r $${icon} ] || continue ; \
! 	    dest=`echo "$${icon}" | sed -e 's|.*/||' -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'` ; \
  	    ( cd $${thisdir}; \
  	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
  	    || exit 1; \