diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-06 15:26:46 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-06 15:26:46 (GMT) |
| commit | 43c307f54e578efbd00b0b4d77e15fbd8ea02df9 (patch) | |
| tree | 00d5188452d6e4b1a6701e512334b6d24161df83 | |
| parent | ec25af24d362b082102b246357cef333522850f1 (diff) | |
Generate org.laptop.Sugar.Presence.service in a simpler way
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/org.laptop.Sugar.Presence.service.in | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 75ca919..86a4e8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,12 @@ servicedir = $(datadir)/dbus-1/services -service_in_files = org.laptop.Sugar.Presence.service.in -service_DATA = $(service_in_files:.service.in=.service) +service_DATA = org.laptop.Sugar.Presence.service -$(service_DATA): $(service_in_files) Makefile - @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ +$(service_DATA): Makefile + ( \ + echo '[D-BUS Service]'; \ + echo 'Name = org.laptop.Sugar.Presence'; \ + echo 'Exec = $(bindir)/sugar-presence-service'; \ + ) > $@ psdatadir = $(datadir)/sugar/services/presence psdata_PYTHON = \ @@ -21,8 +24,6 @@ dist_bin_SCRIPTS = sugar-presence-service DISTCLEANFILES = $(service_DATA) -EXTRA_DIST = $(service_in_files) - dist_check_SCRIPTS = test_psutils.py TESTS_ENVIRONMENT = \ diff --git a/src/org.laptop.Sugar.Presence.service.in b/src/org.laptop.Sugar.Presence.service.in deleted file mode 100644 index 70ecda6..0000000 --- a/src/org.laptop.Sugar.Presence.service.in +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name = org.laptop.Sugar.Presence -Exec = @bindir@/sugar-presence-service - |