From: Glenn Morris <rgm@gnu.org>
Date: Tue, 11 Mar 2008 04:28:49 +0000 (+0000)
Subject: (install-etc, mkdir): Handle directory etc/images/icons/hicolor/*/mimetypes/.
X-Git-Tag: emacs-pretest-23.0.90~7286
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69c7cf1b517059706ec6fb9217410c5893c529dd;p=emacs.git

(install-etc, mkdir): Handle directory etc/images/icons/hicolor/*/mimetypes/.
---

diff --git a/ChangeLog b/ChangeLog
index 2cf8db8d6d7..25d7ad5c7b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-11  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (install-etc, mkdir): Handle directory
+	etc/images/icons/hicolor/*/mimetypes/.
+
 	* make-dist: Handle icons/hicolor/scalable directory.
 
 2008-03-05  Glenn Morris  <rgm@gnu.org>
diff --git a/Makefile.in b/Makefile.in
index e50e8696902..34beec62207 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -578,8 +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 $(iconsrcdir)/*/*x*/apps/*.* \
-	  $(iconsrcdir)/*/scalable/apps/*.*; do \
+	for icon in $(iconsrcdir)/*/*/apps/*.* \
+	  $(iconsrcdir)/*/*/mimetypes/*.*; do \
 	  if [ -r $${icon} ]; then \
 	    iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
 	    ${INSTALL_DATA} $${icon} $${iicon} ; \
@@ -607,7 +607,7 @@ mkdir: FRC
 	  chmod a+r $(DESTDIR)${datadir};\
 	fi
 	icondirs= ; \
-	for dir in $(iconsrcdir)/*/*x*/apps $(iconsrcdir)/*/scalable/apps; do \
+	for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
 	  if [ -d $${dir} ]; then \
 	    icondirs="$${icondirs} $${dir}" ; \
 	  fi ; \