Mercurial > pidgin.yaz

comparison pidgin/pixmaps/Makefile.am @ 30711:ab0c6287e9a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 7f7ef3aa89b9c72fb9cb9d2eb1916d051a108d17) to branch 'im.pidgin.pidgin.mxit' (head 695a97f9710d782a912735770e97840290fff5d9)
author andrew.victor@mxit.com
date Wed, 02 Jun 2010 06:27:24 +0000
parents 2206cd931caf
children 05b63edef7e4
comparison
equal deleted inserted replaced
30710:29e714e980b2 30711:ab0c6287e9a5
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) \
592 $(TRAY_22) \ 611 $(TRAY_22) \
593 $(TRAY_32) \ 612 $(TRAY_32) \
594 $(TRAY_48) 613 $(TRAY_48)
614 endif
595 615
596 nobase_dist_pidginicons_DATA = \ 616 nobase_dist_pidginicons_DATA = \
597 $(ICONS_16) \ 617 $(ICONS_16) \
598 $(ICONS_22) \ 618 $(ICONS_22) \
599 $(ICONS_24) \ 619 $(ICONS_24) \