From 5c8de01d9d2dd7167e51b60a8453737e3af49131 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Sep 2009 09:18:53 -0500 Subject: Adding in the local install flag to make that distcheck passes. --- configure.ac | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b7db004..3cf72a7 100644 --- a/configure.ac +++ b/configure.ac @@ -38,18 +38,33 @@ PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) +########################### +# Check to see if we're local +########################### + +with_localinstall="no" +AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) + ########################### # Indicator Info ########################### -INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +if test "x$with_localinstall" = "xyes"; then + INDICATORDIR="${libdir}/indicators/2/" +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +fi AC_SUBST(INDICATORDIR) ########################### # DBus Service Info ########################### -DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` +if test "x$with_localinstall" = "xyes"; then + DBUSSERVICEDIR="${datadir}/dbus-1/services/" +else + DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` +fi AC_SUBST(DBUSSERVICEDIR) ########################### -- cgit v1.2.3