From 0776820b0fad4a18842902c470b263e0913366cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 09:39:29 -0600 Subject: Switching icons directory to the one provided by package config --- configure.ac | 3 +++ data/icons/16x16/actions/Makefile.am | 2 +- data/icons/16x16/status/Makefile.am | 2 +- data/icons/22x22/actions/Makefile.am | 2 +- data/icons/22x22/status/Makefile.am | 2 +- data/icons/24x24/actions/Makefile.am | 2 +- data/icons/24x24/status/Makefile.am | 2 +- data/icons/32x32/actions/Makefile.am | 2 +- data/icons/32x32/status/Makefile.am | 2 +- data/icons/48x48/status/Makefile.am | 2 +- data/icons/Makefile.am | 2 +- data/icons/scalable/actions/Makefile.am | 2 +- data/icons/scalable/status/Makefile.am | 2 +- 13 files changed, 15 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 4a6aac4..69ca490 100644 --- a/configure.ac +++ b/configure.ac @@ -67,10 +67,13 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" + INDICATORICONSDIR="${pkgdatadir}/icons/" else INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` fi AC_SUBST(INDICATORDIR) +AC_SUBST(INDICATORICONSDIR) ########################### # DBus Service Info diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index dd24a1f..bfcc2d9 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/16x16/actions +iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions icons_DATA = \ system-shutdown.png \ diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am index 624ea41..63e3924 100644 --- a/data/icons/16x16/status/Makefile.am +++ b/data/icons/16x16/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/16x16/status +iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status icons_DATA = \ user-online.png \ diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index 9365485..0b67046 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/22x22/actions +iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions icons_DATA = \ system-shutdown.png \ diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am index 2876545..33f1c26 100644 --- a/data/icons/22x22/status/Makefile.am +++ b/data/icons/22x22/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/22x22/status +iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status icons_DATA = \ user-online.png \ diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index b90d34c..a460b86 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/24x24/actions +iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions icons_DATA = \ system-shutdown.png \ diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am index 3dd28df..9c0a922 100644 --- a/data/icons/24x24/status/Makefile.am +++ b/data/icons/24x24/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/24x24/status +iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status icons_DATA = \ user-online.png \ diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am index 73b0635..427b0b9 100644 --- a/data/icons/32x32/actions/Makefile.am +++ b/data/icons/32x32/actions/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/32x32/actions +iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/actions icons_DATA = \ system-restart.png \ diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am index 19e978b..9fd2318 100644 --- a/data/icons/32x32/status/Makefile.am +++ b/data/icons/32x32/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/32x32/status +iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status icons_DATA = \ user-online.png \ diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am index ec11260..50f5ddf 100644 --- a/data/icons/48x48/status/Makefile.am +++ b/data/icons/48x48/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/48x48/status +iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status icons_DATA = \ user-online.png \ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 17dca13..7c42753 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48 -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(INDICATORICONSDIR)/hicolor install-data-hook: update-icon-cache uninstall-hook: update-icon-cache diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am index 10e9dc1..a3b2f14 100644 --- a/data/icons/scalable/actions/Makefile.am +++ b/data/icons/scalable/actions/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/scalable/actions +iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions icons_DATA = \ system-restart.svg \ diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am index 8f4482b..63bfed4 100644 --- a/data/icons/scalable/status/Makefile.am +++ b/data/icons/scalable/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(pkgdatadir)/icons/hicolor/scalable/status +iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status icons_DATA = \ user-online.svg \ -- cgit v1.2.3