# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1185558510 0
# Node ID 8210d1b5fe56298d0fb33b043fb3994e31cf9ea7
# Parent  c535f00a35123053ff4676f5cbfc143af3e4e098# Parent  f6b8e720dfeaf51d44c8b7a07a35be0b6cba7829
merge of '8fd54462a6faac01b88f24dc2970faa9a28c1978'
     and 'e25b55836c192209148d29686a7a24aa9604fcd0'

diff -r c535f00a3512 -r 8210d1b5fe56 pidgin/pixmaps/icons/Makefile.am
--- a/pidgin/pixmaps/icons/Makefile.am	Fri Jul 27 16:40:24 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.am	Fri Jul 27 17:48:30 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = 16 24 32 48
+SUBDIRS = 16 22 24 32 48
 
 EXTRA_DIST = \
 	Makefile.mingw \
diff -r c535f00a3512 -r 8210d1b5fe56 pidgin/pixmaps/icons/Makefile.mingw
--- a/pidgin/pixmaps/icons/Makefile.mingw	Fri Jul 27 16:40:24 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.mingw	Fri Jul 27 17:48:30 2007 +0000
@@ -11,7 +11,9 @@
 install_real:
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if [ "$$subdir" != "22" ]; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  fi; \
 	  done; \
 	fi;