diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-05-20 11:54:52 +0100 |
| commit | 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 (patch) | |
| tree | e805e504a6e1a15159ef8f2a8976ed147e95689f /data | |
| parent | 4cd65645628c1b3a16cc84225833b67e9876e8ed (diff) | |
| download | telepathy-salut-7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44.tar.gz | |
Revert "Shave salut's build."
This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69.
Conflicts:
lib/gibber/Makefile.am
src/Makefile.am
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index a76fe50d..3504d644 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/tools/shave.mk - EXTRA_DIST = salut.service.in managerdir = $(datadir)/telepathy/managers @@ -13,12 +11,12 @@ service_DATA = org.freedesktop.Telepathy.ConnectionManager.salut.service # non-archaic tarballs) org.freedesktop.Telepathy.ConnectionManager.salut.service: salut.service.in \ Makefile - $(QUIET_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ + @sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ CLEANFILES = $(service_DATA) $(manager_DATA) $(manager_DATA): always-build $(MAKE) -C ../src write-mgr-file - $(QUIET_GEN)../src/write-mgr-file > $@ + ../src/write-mgr-file > $@ .PHONY: always-build |