diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-02 18:22:11 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-02 18:22:11 -0400 |
| commit | d036bcdffe9acef3ca4205344e25c041ffc76482 (patch) | |
| tree | c0e0b005ca66ed0de2300e369b605ffef5b4fa0b | |
| parent | 600d4768d809be989d452dbf6aead5e788112c85 (diff) | |
| download | emacs-d036bcdffe9acef3ca4205344e25c041ffc76482.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d4aa9c935ea..45fe253e044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-11-02 Glenn Morris <rgm@gnu.org> + + * Makefile.in (EMACS_ICON): New variable. + (install-etc): Use EMACS_ICON to allow choice of icon. + 2012-10-26 Glenn Morris <rgm@gnu.org> * Makefile.in (EMACS_NAME): New variable. diff --git a/Makefile.in b/Makefile.in index 78630ef58ff..9b7bf795b84 100644 --- a/Makefile.in +++ b/Makefile.in @@ -632,6 +632,11 @@ install-man: 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 @@ install-etc: 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; \ |