ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 133
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-09-09 09:18:53 -0500
message:
  Adding in the local install flag to make that distcheck passes.
modified:
  Makefile.am
  configure.ac


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file 'Makefile.am'
--- Makefile.am	2009-02-04 17:06:33 +0000
+++ Makefile.am	2009-09-09 14:18:53 +0000
@@ -3,3 +3,5 @@
 	src \
 	data
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+

=== modified file 'configure.ac'
--- configure.ac	2009-09-04 20:37:59 +0000
+++ configure.ac	2009-09-09 14:18:53 +0000
@@ -39,17 +39,32 @@
 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)
 
 ###########################