From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Sep 2014 06:01:33 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.5
X-Git-Tag: 1.5~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b3fba989a84db7d904e09a8f47e3a86d4e0f9577;hp=28bd5057252e61bc5b1a35a00bc1f9fdfde097f7

Merge branch 'master' into branch-1.5
---

diff --git a/icon/Makefile.am b/icon/Makefile.am
index bf147ad3..d0cd9853 100644
--- a/icon/Makefile.am
+++ b/icon/Makefile.am
@@ -117,8 +117,8 @@ clean-local:
 	$(RM) altusmetrum.xpm
 
 install-data-hook:
-	update-mime-database $(datadir)/mime
-	update-icon-caches $(ICON_THEME)
+	update-mime-database $(DESTDIR)$(datadir)/mime
+	update-icon-caches $(DESTDIR)$(ICON_THEME)
 
 $(MPD_ICON): $(MP_ICON)
 	$(LN_S) $(MP_ICON) $@