[Emacs-diffs] /srv/bzr/emacs/trunk r110772: Allow choice of icon style at install time

[Glenn Morris]

------------------------------------------------------------
revno: 110772
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-02 18:22:11 -0400
message:
  Allow choice of icon style at install time
  This feature is intentionally not advertised
  http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12536#40
  
  * Makefile.in (EMACS_ICON): New variable.
  (install-etc): Use EMACS_ICON to allow choice of icon.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-26 18:35:36 +0000
+++ b/ChangeLog 2012-11-02 22:22:11 +0000
@@ -1,3 +1,8 @@
+2012-11-02  Glenn Morris  <address@hidden>
+
+       * Makefile.in (EMACS_ICON): New variable.
+       (install-etc): Use EMACS_ICON to allow choice of icon.
+
 2012-10-26  Glenn Morris  <address@hidden>
 
        * Makefile.in (EMACS_NAME): New variable.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-10-26 18:35:36 +0000
+++ b/Makefile.in       2012-11-02 22:22:11 +0000
@@ -632,6 +632,11 @@
        done
 
 ## Install those items from etc/ that need to end up elsewhere.
+
+## If you prefer, choose "emacs22" at installation time.
+## Note: emacs22 does not have all the resolutions.
+EMACS_ICON=emacs
+
 install-etc:
        umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
        tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
@@ -646,10 +651,10 @@
        for dir in */*/apps */*/mimetypes; do \
          [ -d $${dir} ] || continue ; \
          ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
-         for icon in $${dir}/emacs[.-]*; do \
+         for icon in $${dir}/${EMACS_ICON}[.-]*; do \
            [ -r $${icon} ] || continue ; \
            ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
-           dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 
'$(TRANSFORM)'`.$${ext} ; \
+           dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 
's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \
            ( cd $${thisdir}; \
              ${INSTALL_DATA} ${iconsrcdir}/$${icon} 
$(DESTDIR)${icondir}/$${dir}/$${dest} ) \
            || exit 1; \