[seahorse] Properly substitute bindir in desktop file

[Stefan Walter <stefw src gnome org>]

commit 6b052c77cc5f8a03a7b29e1fe7f9b7bfc2d1da99
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Mon Jun 30 23:41:17 2014 +0200

    Properly substitute bindir in desktop file
    
    This used to work, but was apparently broken again when the build
    system was made (mostly) non-recursive.
    
    Signed-off-by: Stef Walter <stefw redhat com>
     * Fixed 'make distcheck'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732396

 configure.ac                         |    1 -
 data/Makefile.am                     |   11 +++++++++--
 {src => data}/seahorse.desktop.in.in |    0
 po/POTFILES.in                       |    2 +-
 src/Makefile.am                      |   10 ++--------
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e43d031..d2141fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,7 +564,6 @@ po/Makefile.in
 help/Makefile
 data/Makefile
 data/icons/Makefile
-src/seahorse.desktop.in
 ])
 
 echo "
diff --git a/data/Makefile.am b/data/Makefile.am
index a27fba1..d9602bc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 SUBDIRS = icons
 
-
 gsettings_SCHEMAS = \
        org.gnome.seahorse.gschema.xml \
        org.gnome.seahorse.manager.gschema.xml \
@@ -26,6 +25,11 @@ appdata_in_files = seahorse.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
+desktopdir = $(datadir)/applications
+desktop_in_files = seahorse.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = seahorse-search-provider.ini
 
@@ -33,9 +37,12 @@ EXTRA_DIST = \
        $(appdata_in_files) \
        $(convert_DATA) \
        $(gsettings_SCHEMAS) \
-       $(service_in_files)
+       $(service_in_files) \
+       seahorse.desktop.in.in \
+       $(NULL)
 
 CLEANFILES = \
        org.gnome.seahorse.Application.service \
        $(appdata_DATA) \
+       $(desktop_DATA) \
        $(NULL)
diff --git a/src/seahorse.desktop.in.in b/data/seahorse.desktop.in.in
similarity index 100%
rename from src/seahorse.desktop.in.in
rename to data/seahorse.desktop.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1397aa6..7517449 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/seahorse.appdata.xml.in
+data/seahorse.desktop.in.in
 common/catalog.vala
 common/exportable.vala
 gkr/gkr-backend.vala
@@ -83,7 +84,6 @@ pkcs11/pkcs11-request.vala
 pkcs11/pkcs11-private-key.vala
 pkcs11/pkcs11-token.vala
 [type: gettext/glade]src/seahorse-change-passphrase.xml
-src/seahorse.desktop.in.in
 src/seahorse-generate-select.c
 [type: gettext/glade]src/seahorse-generate-select.xml
 src/seahorse-import-dialog.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 170c2a4..3d17714 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,18 +47,12 @@ ui_DATA += \
        src/seahorse-change-passphrase.xml \
        src/seahorse-generate-select.xml
 
-desktopdir = $(datadir)/applications
-desktop_in_files = src/seahorse.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
 man_MANS += src/seahorse.1
 
 EXTRA_DIST += \
        $(man_MANS) \
        $(ui_DATA) \
-       src/seahorse.desktop.in.in
+       $(NULL)
 
 CLEANFILES += *.xmlp* *.bak \
-       $(desktop_DATA) \
-       $(desktop_in_files)
+       $(NULL)