Mercurial > emacs
changeset 92420:12e9e4bb410b
(iconsrcdir): New variable.
(install-etc, mkdir): Use $iconsrcdir. Handle the `scalable' icon directory.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 03 Mar 2008 02:26:30 +0000 |
| parents | 7e8a8ae7576f |
| children | e4b8b0c65ebc |
| files | Makefile.in |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Mar 03 02:17:33 2008 +0000 +++ b/Makefile.in Mon Mar 03 02:26:30 2008 +0000 @@ -177,6 +177,9 @@ # Where the etc/images/icons/hicolor directory is to be installed. icondir=$(datarootdir)/icons +# The source directory for the icon files. +iconsrcdir=$(srcdir)/etc/images/icons + # ==================== Emacs-specific directories ==================== # These variables hold the values Emacs will actually use. They are @@ -575,7 +578,8 @@ install-etc: mkdir ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \ $(DESTDIR)${desktopdir}/emacs.desktop - for icon in $(srcdir)/etc/images/icons/*/*x*/apps/*.*; do \ + for icon in $(iconsrcdir)/*/*x*/apps/*.* \ + $(iconsrcdir)/*/scalable/apps/*.*; do \ if [ -r $${icon} ]; then \ iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \ ${INSTALL_DATA} $${icon} $${iicon} ; \ @@ -603,7 +607,7 @@ chmod a+r $(DESTDIR)${datadir};\ fi icondirs= ; \ - for dir in $(srcdir)/etc/images/icons/*/*x*/apps; do \ + for dir in $(iconsrcdir)/*/*x*/apps $(iconsrcdir)/*/scalable/apps; do \ if [ -d $${dir} ]; then \ icondirs="$${icondirs} $${dir}" ; \ fi ; \