From 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 20 May 2010 11:54:52 +0100
Subject: Revert "Shave salut's build."

This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69.

Conflicts:

	lib/gibber/Makefile.am
	src/Makefile.am
---
 data/Makefile.am | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'data')

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
-- 
cgit v1.2.1