diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/indicator-messages.service.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
7 files changed, 33 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 7220eba..7d58c6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,5 @@ SUBDIRS = \ src \ data +DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall + diff --git a/configure.ac b/configure.ac index b7db004..e00a725 100644 --- a/configure.ac +++ b/configure.ac @@ -39,17 +39,32 @@ 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) ########################### @@ -60,7 +75,6 @@ AC_OUTPUT([ Makefile src/Makefile data/Makefile -data/indicator-messages.service data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/status/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 6177c6d..094a434 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,3 +2,9 @@ SUBDIRS = icons dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-messages.service + +%.service: %.service.in + sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +EXTRA_DIST = indicator-messages.service.in + diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in index 9ae3960..573a2d6 100644 --- a/data/indicator-messages.service.in +++ b/data/indicator-messages.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.ayatana.indicator.messages -Exec=@prefix@/bin/indicator-messages-service +Exec=@libexecdir@/indicator-messages-service diff --git a/debian/changelog b/debian/changelog index a874944..760b9fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,26 +1,9 @@ -indicator-messages (0.2.0-0ubuntu3~ppa2~newapi4) karmic; urgency=low +indicator-messages (0.2.1-0ubuntu1~ppa1) karmic; urgency=low - * LANG=en_UK Bloody Hell + * Merging in v2-api stuff which will become 0.2.1 + * debian/control: Requiring > 0.2.0 of libindicate-* - -- Ted Gould <ted@ubuntu.com> Tue, 08 Sep 2009 20:22:02 -0500 - -indicator-messages (0.2.0-0ubuntu3~ppa2~newapi3) karmic; urgency=low - - * Changing items support - - -- Ted Gould <ted@ubuntu.com> Tue, 08 Sep 2009 20:19:16 -0500 - -indicator-messages (0.2.0-0ubuntu3~ppa2~newapi2) karmic; urgency=low - - * Fix for the changes in libindicate (fixes) - - -- Ted Gould <ted@ubuntu.com> Sat, 05 Sep 2009 11:44:34 -0500 - -indicator-messages (0.2.0-0ubuntu3~ppa2~newapi1) karmic; urgency=low - - * Merging in changes for the new libindicate API - - -- Ted Gould <ted@ubuntu.com> Sat, 05 Sep 2009 11:13:51 -0500 + -- Ted Gould <ted@ubuntu.com> Wed, 09 Sep 2009 11:03:47 -0500 indicator-messages (0.2.0-0ubuntu3~ppa1) karmic; urgency=low diff --git a/debian/control b/debian/control index 99fbbcf..08f19e3 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, scrollkeeper, intltool, - libindicate-dev (>= 0.2.0~bzr298), - libindicate-gtk-dev (>= 0.2.0~bzr298), + libindicate-dev (>= 0.2.0), + libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.2.0~bzr301), libdbusmenu-gtk-dev (>= 0.1.1), libdbusmenu-glib-dev (>= 0.1.1) diff --git a/src/Makefile.am b/src/Makefile.am index 38787a1..01741d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = indicator-messages-service +libexec_PROGRAMS = indicator-messages-service ###################################### # Building the messages indicator |