Mercurial > pidgin
changeset 18666:8210d1b5fe56
merge of '8fd54462a6faac01b88f24dc2970faa9a28c1978'
and 'e25b55836c192209148d29686a7a24aa9604fcd0'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 27 Jul 2007 17:48:30 +0000 |
| parents | c535f00a3512 (current diff) f6b8e720dfea (diff) |
| children | b256b4808a6b |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;