From 124486885e4ed122d4a536dbef844413faffb3a5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 15:10:24 -0500 Subject: Installing to indicator dir instead of other fun places --- configure.ac | 8 ++++++++ src/Makefile.am | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ea25eac..183fec8 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,13 @@ PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION 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 -- cgit v1.2.3