From 1fb200d18cc385230b3af574816ec354682cc5c9 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 9 Sep 2014 23:00:14 -0700 Subject: icons: Use DESTDIR when updating mime/icon caches This is done in install-data-hook and needs to explicitly use DESTDIR Signed-off-by: Keith Packard --- icon/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) $@ -- cgit v1.2.3 From a72b7683606d3e741043011c929482a0a168a5c9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 9 Sep 2014 23:44:45 -0600 Subject: more build dependencies for processing icons --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3c9e8999..7ab12d42 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos -- cgit v1.2.3