[seahorse/gnome-3-4] Better building for .desktop files

[Stefan Walter <stefw src gnome org>]

commit 94e3dfa07ae022e83c24120c05b2a52975f45328
Author: Stef Walter <stefw gnome org>
Date:   Fri Mar 30 14:56:00 2012 +0200

    Better building for .desktop files

 Makefile.decl              |   37 +++++++++++++++++++++++++++++++++++++
 configure.ac               |    1 -
 src/Makefile.am            |    5 +++--
 src/seahorse.desktop.in.in |    2 +-
 4 files changed, 41 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
new file mode 100644
index 0000000..ab3bcf9
--- /dev/null
+++ b/Makefile.decl
@@ -0,0 +1,37 @@
+NULL =
+
+V_ASN1 = $(V_ASN1_$(V))
+V_ASN1_ = $(V_ASN1_$(AM_DEFAULT_VERBOSITY))
+V_ASN1_0 = @echo "  ASN1  " $@;
+
+.asn.asn.h:
+	$(V_ASN1) $(ASN1PARSER) -o $@ $< && sed -i 's|#include.*|/* \0 */|' $@
+
+V_SED = $(V_SED_$(V))
+V_SED_ = $(V_SED_$(AM_DEFAULT_VERBOSITY))
+V_SED_0 = @echo "  SED   " $@;
+
+SED_SUBST = sed \
+	-e 's,[ ]datadir[@],$(datadir),g' \
+	-e 's,[ ]libexecdir[@],$(libexecdir),g' \
+	-e 's,[ ]libdir[@],$(libdir),g' \
+	-e 's,[ ]includedir[@],$(includedir),g' \
+	-e 's,[ ]datarootdir[@],$(datarootdir),g' \
+	-e 's,[ ]sysconfdir[@],$(sysconfdir),g' \
+	-e 's,[ ]bindir[@],$(bindir),g' \
+	-e 's,[ ]exec_prefix[@],$(exec_prefix),g' \
+	-e 's,[ ]prefix[@],$(prefix),g' \
+	-e 's,[ ]PACKAGE[@],$(PACKAGE),g' \
+	-e 's,[ ]VERSION[@],$(VERSION),g' \
+	-e 's,[ ]VALGRIND_RUN[@],$(VALGRIND_RUN),g' \
+	$(NULL)
+
+.desktop.in.in.desktop.in:
+	$(V_SED) $(SED_SUBST) $< > $@
+
+ INTLTOOL_DESKTOP_RULE@
+
+.service.in.service:
+	$(V_SED) $(SED_SUBST) $< > $@
+
+SUFFIXES = .asn .asn.h .desktop.in .desktop.in.in .service .service.in
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 8f5bed0..2314710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,6 @@ data/Makefile
 data/icons/Makefile
 pkcs11/Makefile
 src/Makefile
-src/seahorse.desktop.in
 ssh/Makefile
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index fdf13b6..b83df82 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+include $(top_srcdir)/Makefile.decl
 
 uidir = $(datadir)/seahorse/ui/
 localedir = $(datadir)/locale
@@ -67,5 +68,5 @@ EXTRA_DIST = \
 	seahorse.desktop.in.in
 
 CLEANFILES = *.xmlp* *.bak \
-    $(desktop_DATA) \
-    seahorse.desktop.in 
+	$(desktop_DATA) \
+	$(desktop_in_files)
diff --git a/src/seahorse.desktop.in.in b/src/seahorse.desktop.in.in
index 204c920..c2d9578 100644
--- a/src/seahorse.desktop.in.in
+++ b/src/seahorse.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Passwords and Keys
 _Comment=Manage your passwords and encryption keys
-Exec=seahorse
+Exec= bindir@/seahorse
 Terminal=false
 Type=Application
 Icon=seahorse