diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-05 13:47:38 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-09-05 13:47:38 +0200 |
| commit | 71d0930ef05dba37123b95b8eb7659714c058fe5 (patch) | |
| tree | 097ef624daead6828b38551fd85c67e13a368771 /data | |
| parent | 68214f0cdf9b3a2bcadc5884fa222397d7610f81 (diff) | |
| download | zeitgeist-71d0930ef05dba37123b95b8eb7659714c058fe5.tar.gz | |
Drop dbus-services-dir configure flag
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 15 | ||||
| -rw-r--r-- | data/org.gnome.zeitgeist.service.in | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 5cedd84d..ae148b32 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,12 +4,8 @@ SUBDIRS = \ ontology \ $(NULL) -servicedir = $(DBUS_SERVICES_DIR) -service_DATA = org.gnome.zeitgeist.service - -org.gnome.zeitgeist.service: org.gnome.zeitgeist.service.in - $(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@ -org.gnome.zeitgeist.service: Makefile +servicedir = $(datadir)/dbus-1/services +nodist_service_DATA = org.gnome.zeitgeist.service bashcompletiondir = $(datadir)/bash-completion/completions dist_bashcompletion_DATA = completions/zeitgeist-daemon @@ -18,7 +14,7 @@ xdgautostart_in_files = zeitgeist-datahub.desktop.in if ENABLE_DATAHUB xdgautostartdir=$(sysconfdir)/xdg/autostart -xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) +nodist_xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) endif CLEANFILES = \ @@ -33,10 +29,11 @@ EXTRA_DIST = \ $(xdgautostart_in_files) \ $(NULL) -all-local: org.gnome.zeitgeist.service - %.desktop: %.desktop.in $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +%.service: %.service.in + $(AM_V_GEN)sed -e "s|@bindir[@]|$(bindir)|" $< > $@ + clean: rm -rf *.pyc *.~[0-9]~ diff --git a/data/org.gnome.zeitgeist.service.in b/data/org.gnome.zeitgeist.service.in index 180116f7..4b20045c 100644 --- a/data/org.gnome.zeitgeist.service.in +++ b/data/org.gnome.zeitgeist.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.gnome.zeitgeist.Engine -Exec=@prefix@/bin/zeitgeist-daemon +Exec=@bindir@/zeitgeist-daemon |