moderntheme_DATA = theme/Modern/*
matrixthemedir = $(datadir)/livewp/theme/Matrix
-matrixtheme_DATA = theme/Matrix/*
-EXTRA_DIST = $(berlintheme_DATA) $(moderntheme_DATA) $(matrixtheme_DATA)
+matrixtheme_DATA = theme/Matrix/*
+
+dbus_servicedir = $(datadir)/dbus-1/services
+dbus_service_DATA = org.maemo.livewp.service
+
+desktopdir = $(datadir)/applications/hildon
+desktop_files = livewp.desktop
+desktop_DATA = $(desktop_files)
+
+
+EXTRA_DIST = $(berlintheme_DATA) \
+ $(moderntheme_DATA) \
+ $(matrixtheme_DATA) \
+ $(dbus_service_DATA)
+
+
+livewp.desktop: livewp.desktop.in
+ sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \
+ sed "s/__PACKAGE__/$(PACKAGE)/g" $@.tmp >$@ && \
+ $(RM) *.tmp
+