[gnome-keyring] Better building of .desktop and .service files

[Stefan Walter <stefw src gnome org>]

commit 987d00ac97ac0d73cd658b4bd5d4fac934edf678
Author: Stef Walter <stefw gnome org>
Date:   Fri Mar 30 14:49:40 2012 +0200

    Better building of .desktop and .service files

 Makefile.decl                              |   37 ++++++++++++++++++++++++++++
 configure.ac                               |   20 ---------------
 daemon/Makefile.am                         |    4 +-
 daemon/gnome-keyring-gpg.desktop.in.in     |    2 +-
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    2 +-
 daemon/gnome-keyring-secrets.desktop.in.in |    2 +-
 daemon/gnome-keyring-ssh.desktop.in.in     |    2 +-
 daemon/org.freedesktop.secrets.service.in  |    2 +-
 daemon/org.gnome.keyring.service.in        |    2 +-
 9 files changed, 45 insertions(+), 28 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 41d033e..06e9270 100644
--- a/configure.ac
+++ b/configure.ac
@@ -695,29 +695,9 @@ AC_SUBST(DAEMON_LIBS)
 AC_SUBST(P11_TESTS_CFLAGS)
 AC_SUBST(P11_TESTS_LIBS)
 
-# HACK: Because autoconf is nasty
-if test "${prefix}" = "NONE"; then
-    prefix=/usr/local
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-
-eval BINDIR="$bindir"
-AC_SUBST(BINDIR)
-
-eval LIBEXECDIR="$libexecdir"
-AC_SUBST(LIBEXECDIR)
-
 AC_OUTPUT([
 Makefile
 daemon/Makefile
-daemon/gnome-keyring-gpg.desktop.in
-daemon/gnome-keyring-pkcs11.desktop.in
-daemon/gnome-keyring-secrets.desktop.in
-daemon/gnome-keyring-ssh.desktop.in
-daemon/org.gnome.keyring.service
-daemon/org.freedesktop.secrets.service
 daemon/control/Makefile
 daemon/control/tests/Makefile
 daemon/dbus/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index e9b9c1d..582c7db 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS = \
 	login \
 	control \
@@ -76,5 +78,3 @@ install-exec-hook:
 	setcap cap_ipc_lock=ep $(DESTDIR)$(bindir)/gnome-keyring-daemon || true
 
 endif
-
- INTLTOOL_DESKTOP_RULE@
diff --git a/daemon/gnome-keyring-gpg.desktop.in.in b/daemon/gnome-keyring-gpg.desktop.in.in
index 4a87646..ad268b4 100644
--- a/daemon/gnome-keyring-gpg.desktop.in.in
+++ b/daemon/gnome-keyring-gpg.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=GPG Password Agent
 _Comment=GNOME Keyring: GPG Agent
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=gpg
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --components=gpg
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in.in
index 8d07b9e..610bc31 100644
--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
+++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=Certificate and Key Storage
 _Comment=GNOME Keyring: PKCS#11 Component
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --components=pkcs11
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in.in
index 3102de0..fe10b31 100644
--- a/daemon/gnome-keyring-secrets.desktop.in.in
+++ b/daemon/gnome-keyring-secrets.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=Secret Storage Service
 _Comment=GNOME Keyring: Secret Service
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --components=secrets
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in.in
index e7e40e8..b3f7be1 100644
--- a/daemon/gnome-keyring-ssh.desktop.in.in
+++ b/daemon/gnome-keyring-ssh.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=SSH Key Agent
 _Comment=GNOME Keyring: SSH Agent
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --components=ssh
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false
diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in
index aab572a..eb4b4dd 100644
--- a/daemon/org.freedesktop.secrets.service.in
+++ b/daemon/org.freedesktop.secrets.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.secrets
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --foreground --components=secrets
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --foreground --components=secrets
diff --git a/daemon/org.gnome.keyring.service.in b/daemon/org.gnome.keyring.service.in
index a0f8ba4..0066101 100644
--- a/daemon/org.gnome.keyring.service.in
+++ b/daemon/org.gnome.keyring.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.keyring
-Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --foreground --components=secrets
+Exec= VALGRIND_RUN@@bindir@/gnome-keyring-daemon --start --foreground --components=secrets