diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | data/indicator-session.service.in | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index ee90bae..c3424a6 100644 --- a/configure.ac +++ b/configure.ac @@ -106,17 +106,6 @@ AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) ########################### -# 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) - -########################### # Google Test framework ########################### diff --git a/data/Makefile.am b/data/Makefile.am index 69ac65d..a1a1c3b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,13 +2,6 @@ SUBDIRS = \ icons \ extra-sessions -dbus_servicesdir = $(DBUSSERVICEDIR) -service_in_files = indicator-session.service.in -dbus_services_DATA = $(service_in_files:.service.in=.service) - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_in_files = indicator-session.conf.in upstart_jobs_DATA = $(upstart_jobs_in_files:.conf.in=.conf) @@ -26,11 +19,9 @@ convertdir = $(datadir)/GConf/gsettings dist_convert_DATA = indicator-session.convert EXTRA_DIST = \ - $(service_in_files) \ $(upstart_jobs_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) CLEANFILES = \ - $(dbus_services_DATA) \ $(upstart_jobs_DATA) \ $(gsettings_SCHEMAS) diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in deleted file mode 100644 index a4d10a1..0000000 --- a/data/indicator-session.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.session -Exec=@libexecdir@/indicator-session-service |