# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1204511190 0
# Node ID 12e9e4bb410b3f479c5369163b8ae23117ee039a
# Parent  7e8a8ae7576fcd6183ca8b96e759e5aad32ec884
(iconsrcdir): New variable.
(install-etc, mkdir): Use $iconsrcdir.  Handle the `scalable' icon directory.

diff -r 7e8a8ae7576f -r 12e9e4bb410b Makefile.in
--- 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 ; \