aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-04-22 15:10:24 -0500
committerTed Gould <ted@canonical.com>2009-04-22 15:10:24 -0500
commit124486885e4ed122d4a536dbef844413faffb3a5 (patch)
tree3e4edd18819234bea8067bbaa270e4e963f45f35
parenta98311e89708a52946534d648220dbbd708f2eaa (diff)
downloadayatana-indicator-messages-124486885e4ed122d4a536dbef844413faffb3a5.tar.gz
ayatana-indicator-messages-124486885e4ed122d4a536dbef844413faffb3a5.tar.bz2
ayatana-indicator-messages-124486885e4ed122d4a536dbef844413faffb3a5.zip
Installing to indicator dir instead of other fun places
-rw-r--r--configure.ac8
-rw-r--r--src/Makefile.am2
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index ea25eac..183fec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,13 @@ AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
###########################
+# Indicator Info
+###########################
+
+INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+AC_SUBST(INDICATORDIR)
+
+###########################
# Files
###########################
@@ -66,4 +73,5 @@ AC_MSG_NOTICE([
Messaging Indicator Configuration:
Prefix: $prefix
+ Indicator Dir: $INDICATORDIR
])
diff --git a/src/Makefile.am b/src/Makefile.am
index eb6ba12..986e89d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-messaginglibdir = $(libdir)/indicators/1
+messaginglibdir = $(INDICATORDIR)
messaginglib_LTLIBRARIES = libmessaging.la
libmessaging_la_SOURCES = indicator-messages.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h
libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed