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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index ea5aba69..f5608c38 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/tools/shave.mk - tools_dir = $(top_srcdir)/tools man_MANS = telepathy-salut.8 @@ -14,10 +12,10 @@ CLEANFILES = \ $(html_DATA) %.8: %.8.in Makefile - $(QUIET_GEN)sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@ + sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@ $(html_DATA): %.html: %.xml $(tools_dir)/xep.xsl - $(QUIET_GEN)$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@ + $(XSLTPROC) $(tools_dir)/xep.xsl $< > $@ proto-xep-upload: $(html_DATA) rsync -P $(html_DATA) people.collabora.co.uk:public_html/ |