diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-07-04 16:00:09 -0400 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-07-04 16:00:09 -0400 |
| commit | 0ef34d217850fcf160e1045dbd4a0be412e5087e (patch) | |
| tree | 0e5291d6d08660176f589e7dcf186f62b835093d | |
| parent | a1bb4f83f6da959ede2c7e486d26304c63cfae40 (diff) | |
| download | ayatana-indicator-sound-0ef34d217850fcf160e1045dbd4a0be412e5087e.tar.gz ayatana-indicator-sound-0ef34d217850fcf160e1045dbd4a0be412e5087e.tar.bz2 ayatana-indicator-sound-0ef34d217850fcf160e1045dbd4a0be412e5087e.zip | |
Remove --enable-localinstall
Always put dbus service file into $(datadir)/dbus-1/services
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | data/Makefile.am | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 3ba6110..3544dc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,4 @@ EXTRA_DIST = \ autogen.sh \ vapi/config.vapi -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall - include $(top_srcdir)/Makefile.am.coverage diff --git a/configure.ac b/configure.ac index 706b998..5c0be0f 100644 --- a/configure.ac +++ b/configure.ac @@ -48,13 +48,6 @@ AC_SUBST(COVERAGE_CXXFLAGS) AC_SUBST(COVERAGE_LDFLAGS) ########################### -# 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) - -########################### # Grab the GSettings Macros ########################### @@ -64,13 +57,6 @@ GLIB_GSETTINGS # DBus Service Info ########################### -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) - AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], [], diff --git a/data/Makefile.am b/data/Makefile.am index a64dff4..5160dd9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ gsettings_SCHEMAS = \ com.canonical.indicator.sound.gschema.xml @GSETTINGS_RULES@ -dbus_servicesdir = $(DBUSSERVICEDIR) +dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-sound.service %.service: %.service.in |