From 26e95dd525ecee8024bcee0e45730798e08c877a Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Mon, 27 Aug 2012 09:16:57 +0200
Subject: Install icons in the standard path

---
 configure.ac                               | 3 ---
 data/icons/16x16/categories/Makefile.am    | 2 +-
 data/icons/16x16/status/Makefile.am        | 2 +-
 data/icons/22x22/categories/Makefile.am    | 2 +-
 data/icons/22x22/status/Makefile.am        | 2 +-
 data/icons/24x24/status/Makefile.am        | 2 +-
 data/icons/32x32/categories/Makefile.am    | 2 +-
 data/icons/32x32/status/Makefile.am        | 2 +-
 data/icons/48x48/status/Makefile.am        | 2 +-
 data/icons/scalable/categories/Makefile.am | 2 +-
 data/icons/scalable/status/Makefile.am     | 2 +-
 11 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index d9270dd..08560c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,13 +106,10 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all
 
 if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/2/"
-	INDICATORICONSDIR="${datadir}/libindicate/icons/"
 else
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 fi
 AC_SUBST(INDICATORDIR)
-AC_SUBST(INDICATORICONSDIR)
 
 ###########################
 # DBus Service Info
diff --git a/data/icons/16x16/categories/Makefile.am b/data/icons/16x16/categories/Makefile.am
index 171e2f9..2ddfa63 100644
--- a/data/icons/16x16/categories/Makefile.am
+++ b/data/icons/16x16/categories/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/categories
+iconsdir = $(datadir)/icons/hicolor/16x16/categories
 
 icons_DATA =  \
 	applications-email-panel.png \
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index e9c66f1..adafb8c 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
+iconsdir = $(datadir)/icons/hicolor/16x16/status
 
 icons_DATA =  \
 	application-running.png \
diff --git a/data/icons/22x22/categories/Makefile.am b/data/icons/22x22/categories/Makefile.am
index 02885d3..b1ea14c 100644
--- a/data/icons/22x22/categories/Makefile.am
+++ b/data/icons/22x22/categories/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/categories
+iconsdir = $(datadir)/icons/hicolor/22x22/categories
 
 icons_DATA =  \
 	applications-email-panel.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index f18bbcc..470c817 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
+iconsdir = $(datadir)/icons/hicolor/22x22/status
 
 icons_DATA =  \
 	indicator-messages.png \
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index 7686c0e..086c404 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
+iconsdir = $(datadir)/icons/hicolor/24x24/status
 
 icons_DATA =  \
 	application-running.png \
diff --git a/data/icons/32x32/categories/Makefile.am b/data/icons/32x32/categories/Makefile.am
index 3a74b80..6fcfb7b 100644
--- a/data/icons/32x32/categories/Makefile.am
+++ b/data/icons/32x32/categories/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/categories
+iconsdir = $(datadir)/icons/hicolor/32x32/categories
 
 icons_DATA =  \
 	applications-email-panel.png \
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index 84d9609..00f9d53 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
+iconsdir = $(datadir)/icons/hicolor/32x32/status
 
 icons_DATA =  \
 	application-running.png \
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index ee7eb74..9c560b5 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
+iconsdir = $(datadir)/icons/hicolor/48x48/status
 
 icons_DATA =  \
 	application-running.png \
diff --git a/data/icons/scalable/categories/Makefile.am b/data/icons/scalable/categories/Makefile.am
index 64ce622..0fdbbd7 100644
--- a/data/icons/scalable/categories/Makefile.am
+++ b/data/icons/scalable/categories/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/categories
+iconsdir = $(datadir)/icons/hicolor/scalable/categories
 
 icons_DATA =  \
 	applications-email-panel.svg \
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index 060b479..59f0256 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -1,5 +1,5 @@
 
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
+iconsdir = $(datadir)/icons/hicolor/scalable/status
 
 icons_DATA =  \
 	application-running.svg \
-- 
cgit v1.2.3