[gnome-blog] Only include GNOME_BlogApplet.server.in.in in tarball

[Olav Vitters <ovitters src gnome org>]

commit 71e7907218fc9d01ad91a4f385ddba4cdac89313
Author: Olav Vitters <olav bkor dhs org>
Date:   Fri Mar 12 11:33:08 2010 +0100

    Only include GNOME_BlogApplet.server.in.in in tarball
    
    Otherwise the path to the binary is not automatically adjusted. Changed
    the Makefile using the one from netspeed.

 Makefile.am |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b901125..04406d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,12 @@
 serverdir = $(libdir)/bonobo/servers
-server_in_files = GNOME_BlogApplet.server.in
-server_DATA = $(server_in_files:.server.in=.server)
+server_DATA = GNOME_BlogApplet.server
+server_in_files = $(server_DATA:=.in)
+server_in_in_files = $(server_in_files:=.in)
+ INTLTOOL_SERVER_RULE@
 
-$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+$(server_in_files): $(server_in_in_files) Makefile
+	sed s,@LIBEXECDIR@,$(libexecdir),g <$< >$@
 
- INTLTOOL_SERVER_RULE@
 
 bin_SCRIPTS = gnome-blog-poster
 libexec_SCRIPTS = blog_applet.py
@@ -93,9 +94,11 @@ install-data-local:
         GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
                 gconftool-2 --makefile-install-rule $(schema_DATA)
 
+CLEANFILES = $(server_DATA)
+
 DISTCLEANFILES =                \
 	$(schema_DATA)		\
-	$(server_DATA)		\
+	$(server_in_files)	\
 	$(Desktop_DATA)		\
         intltool-extract        \
         intltool-merge          \
@@ -129,8 +132,7 @@ EXTRA_DIST =  			\
         intltool-extract.in     \
         intltool-merge.in       \
 	gnome-blog.spec		\
-	gnome-blog.spec.in 	\
-	$(server_in_files)
+	gnome-blog.spec.in
 
 SUBDIRS = protocols po