diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-10 01:32:27 -0600 |
| commit | 05e4094411f861bf29bea2e9c39c1b66f8f267f8 (patch) | |
| tree | 0e1037212fb440b1f8beb3288a0a9e8ee8a452ac /icon | |
| parent | acb279125c0fa377c8b1dbbb8634fba60f7f845b (diff) | |
| parent | 2ee937b603b181bb24768eb4d0e2f918a5377fd3 (diff) | |
Merge branch 'master' into branch-1.5
Diffstat (limited to 'icon')
| -rw-r--r-- | icon/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/icon/Makefile.am b/icon/Makefile.am index d0cd9853..c08e9236 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -85,8 +85,10 @@ MIME_ICONS = $(EEPROM_ICON) $(TELEM_ICON) $(MPD_ICON) mimeicondir = $(ICON_THEME)/scalable/mimetypes mimeicon_DATA = $(MIME_ICONS) +if INSTALL_SHARED_MIME_INFO mimedir = $(datadir)/mime/packages mime_DATA = org-altusmetrum-mimetypes.xml +endif pixmapdir = $(datadir)/pixmaps pixmap_DATA = altusmetrum.xpm @@ -116,9 +118,11 @@ clean-local: $(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON) $(RM) altusmetrum.xpm +if INSTALL_SHARED_MIME_INFO install-data-hook: update-mime-database $(DESTDIR)$(datadir)/mime update-icon-caches $(DESTDIR)$(ICON_THEME) +endif $(MPD_ICON): $(MP_ICON) $(LN_S) $(MP_ICON) $@ |