[SCM] calf/master: Do not update icon cache if DESTDIR is specified - should help packagers

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:40:18 UTC 2013


The following commit has been merged in the master branch:
commit bdadb85afa521b5afcc2e2cb0450a8e341f0df4a
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Thu May 20 00:01:35 2010 +0100

    Do not update icon cache if DESTDIR is specified - should help packagers

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 371e68c..e478692 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -6,11 +6,11 @@ install-data-hook:
 		mkdir -p "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/"; \
 		cp "calf_$${fn}.png" "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
 	done
-	@-gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
+	@-test -z "$(DESTDIR)" && gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
 	
 uninstall-hook:
 	@-for fn in $(SIZES); do \
 		rm -f "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
 	done
-	@-gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
+	@-test -z "$(DESTDIR)" && gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
 	

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list