diff options
Diffstat (limited to 'pidgin/pixmaps/Makefile.am')
| -rw-r--r-- | pidgin/pixmaps/Makefile.am | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am index 17d9098b82..76ec21c037 100644 --- a/pidgin/pixmaps/Makefile.am +++ b/pidgin/pixmaps/Makefile.am @@ -482,6 +482,8 @@ TRAY_16_ICO = \ tray/16/message_4bit.ico \ tray/16/offline_4bit.ico +TRAY_THEME = tray/hicolor/index.theme + TRAY_16 = \ tray/hicolor/16x16/status/pidgin-tray-away.png \ tray/hicolor/16x16/status/pidgin-tray-busy.png \ @@ -584,11 +586,32 @@ nobase_dist_pidginpixmap_DATA = \ $(TOOLBAR_22) \ $(TOOLBAR_32) \ $(TOOLBAR_48) \ + $(TRAY_THEME) \ + $(TRAY_16_ICO) +if ENABLE_TRAYCOMPAT +# Install in a location compatible with hicolor-icon-theme 0.9 + +pidginpixmaptray16dir = $(datadir)/pixmaps/pidgin/tray/hicolor/16x16/actions +dist_pidginpixmaptray16_DATA = $(TRAY_16) + +pidginpixmaptray22dir = $(datadir)/pixmaps/pidgin/tray/hicolor/22x22/actions +dist_pidginpixmaptray22_DATA = $(TRAY_22) + +pidginpixmaptray32dir = $(datadir)/pixmaps/pidgin/tray/hicolor/32x32/actions +dist_pidginpixmaptray32_DATA = $(TRAY_32) + +pidginpixmaptray48dir = $(datadir)/pixmaps/pidgin/tray/hicolor/48x48/actions +dist_pidginpixmaptray48_DATA = $(TRAY_48) + +else +# Install in the "correct" locations + +nobase_dist_pidginpixmap_DATA += \ $(TRAY_16) \ - $(TRAY_16_ICO) \ $(TRAY_22) \ $(TRAY_32) \ $(TRAY_48) +endif nobase_dist_pidginicons_DATA = \ $(ICONS_16) \ |