aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-09-25 08:37:52 -0500
committerTed Gould <ted@canonical.com>2009-09-25 08:37:52 -0500
commit82f05a0cb11648cafaed130c12ef1db630299377 (patch)
tree391fc2ea42e386f650606c260b2e98ab2bf45976
parent6dc6c07815ec4034e8a62ced7b3638c476ce78f8 (diff)
parent1663b9c4812700bb2da614b47c84ee63e167dea6 (diff)
downloadayatana-indicator-messages-82f05a0cb11648cafaed130c12ef1db630299377.tar.gz
ayatana-indicator-messages-82f05a0cb11648cafaed130c12ef1db630299377.tar.bz2
ayatana-indicator-messages-82f05a0cb11648cafaed130c12ef1db630299377.zip
Getting the path for icons from pkgconfig and putting them in the right location.
-rw-r--r--configure.ac3
-rw-r--r--data/icons/16x16/status/Makefile.am2
-rw-r--r--data/icons/22x22/status/Makefile.am2
-rw-r--r--data/icons/24x24/status/Makefile.am2
-rw-r--r--data/icons/32x32/status/Makefile.am2
-rw-r--r--data/icons/48x48/status/Makefile.am2
-rw-r--r--data/icons/scalable/status/Makefile.am2
7 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 1c67c9e..a338fea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,10 +53,13 @@ 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 indicator`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
fi
AC_SUBST(INDICATORDIR)
+AC_SUBST(INDICATORICONSDIR)
###########################
# DBus Service Info
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index aba6050..e9fdeed 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/16x16/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
icons_DATA = \
indicator-messages.png \
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index eaf7c32..f18bbcc 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/22x22/status
+iconsdir = $(INDICATORICONSDIR)/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 80f8c7f..71378be 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/24x24/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
icons_DATA = \
indicator-messages.png \
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index 22076b6..e34608b 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/32x32/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
icons_DATA = \
indicator-messages.png \
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index 6b56cd5..69c0996 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/48x48/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
icons_DATA = \
indicator-messages.png \
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index 727d291..263735a 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -1,5 +1,5 @@
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/scalable/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
icons_DATA = \
indicator-messages.svg \