Mercurial > pidgin.yaz
comparison pidgin/pixmaps/Makefile.am @ 30535:34af082d702e
Add a configure option --enable-trayicon-compat which installs tray icons
into a directory compatible with older versions of hicolor-icon-theme. Use
this option on distros that don't have a new enough copy. If you actually
have a new enough copy, this option should not have any adverse effects.
Fixes #11846.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 28 May 2010 06:14:35 +0000 |
parents | 295acc982197 |
children | 2206cd931caf |
comparison
equal
deleted
inserted
replaced
30534:95d2b6fc228a | 30535:34af082d702e |
---|---|
585 $(TOOLBAR_16) \ | 585 $(TOOLBAR_16) \ |
586 $(TOOLBAR_22) \ | 586 $(TOOLBAR_22) \ |
587 $(TOOLBAR_32) \ | 587 $(TOOLBAR_32) \ |
588 $(TOOLBAR_48) \ | 588 $(TOOLBAR_48) \ |
589 $(TRAY_THEME) \ | 589 $(TRAY_THEME) \ |
590 $(TRAY_16_ICO) | |
591 if ENABLE_TRAYCOMPAT | |
592 # Install in a location compatible with hicolor-icon-theme 0.9 | |
593 | |
594 pidginpixmaptray16dir = $(datadir)/pixmaps/pidgin/tray/hicolor/16x16/actions | |
595 dist_pidginpixmaptray16_DATA = $(TRAY_16) | |
596 | |
597 pidginpixmaptray22dir = $(datadir)/pixmaps/pidgin/tray/hicolor/22x22/actions | |
598 dist_pidginpixmaptray22_DATA = $(TRAY_22) | |
599 | |
600 pidginpixmaptray32dir = $(datadir)/pixmaps/pidgin/tray/hicolor/32x32/actions | |
601 dist_pidginpixmaptray32_DATA = $(TRAY_32) | |
602 | |
603 pidginpixmaptray48dir = $(datadir)/pixmaps/pidgin/tray/hicolor/48x48/actions | |
604 dist_pidginpixmaptray48_DATA = $(TRAY_48) | |
605 | |
606 else | |
607 # Install in the "correct" locations | |
608 | |
609 nobase_dist_pidginpixmap_DATA += \ | |
590 $(TRAY_16) \ | 610 $(TRAY_16) \ |
591 $(TRAY_16_ICO) \ | 611 $(TRAY_16_ICO) \ |
592 $(TRAY_22) \ | 612 $(TRAY_22) \ |
593 $(TRAY_32) \ | 613 $(TRAY_32) \ |
594 $(TRAY_48) | 614 $(TRAY_48) |
615 endif | |
595 | 616 |
596 nobase_dist_pidginicons_DATA = \ | 617 nobase_dist_pidginicons_DATA = \ |
597 $(ICONS_16) \ | 618 $(ICONS_16) \ |
598 $(ICONS_22) \ | 619 $(ICONS_22) \ |
599 $(ICONS_24) \ | 620 $(ICONS_24) \ |