Merging in the branch getting the status icons working.

12 files changed, 12 insertions, 12 deletions

diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
index c16c33a..5aa276c 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 ad0c491..7b286f6 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 8df746b..73cdd09 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 ab5937b..c0a7f76 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 e69423c..55c63d1 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 76676a6..e26596c 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 522ab5d..74c2c8d 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 bcfd6ac..e7967f4 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 102f579..a2ff495 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 9c64beb..39b4177 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 0df2f79..2c70d33 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			\