changeset
merge of '2a44902e9cd602aa1c8067c5696369ad061f6a63'
Fri, 27 Jul 2007 17:48:30 +0000
- author
- Luke Schierer <lschiere@pidgin.im>
- date
- Fri, 27 Jul 2007 17:48:30 +0000
- changeset 18965
- 5c943654d258
- parent 18963
- 2a44902e9cd6 (current diff)
- parent 18964
- 0b15ffc5d2a4 (diff)
- child 18966
- 6a0715b72b6b
merge of '2a44902e9cd602aa1c8067c5696369ad061f6a63'
and '0b15ffc5d2a4f6e33e4b98e9180a143ef3b395d2'
--- 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 \
--- 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;
