(iconsrcdir): New variable.

(install-etc, mkdir): Use $iconsrcdir.  Handle the `scalable' icon directory.

diff --git a/ChangeLog b/ChangeLog
index 4ed7eadd721cd178d31a72422bc137fdbb6d4de3..9aa6f7c0123a4d403f84a984b7e893ee2b0e2dfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (iconsrcdir): New variable.
+       (install-etc, mkdir): Use $iconsrcdir.  Handle the `scalable' icon
+       directory.
+
 2008-02-29  Glenn Morris  <rgm@gnu.org>
 
        * test/: New directory.

diff --git a/Makefile.in b/Makefile.in
index 721883e9943e568bb0880346b54fab661c47a60e..e50e869690224065cdb5a137c0ecaae4798e134d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,6 +177,9 @@ desktopdir=$(datarootdir)/applications
 # 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-arch-indep: mkdir info install-etc
 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 @@ mkdir: FRC
          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 ; \