[gnome-user-share] build: Properly expand paths in gnome-user-share-webdav.desktop

[Bastien Nocera <hadess src gnome org>]

commit 4964f16d827bdd0d3a730d5ee431bafbf2841f40
Author: Michael Biebl <biebl debian org>
Date:   Fri Sep 2 18:12:59 2016 +0200

    build: Properly expand paths in gnome-user-share-webdav.desktop
    
    https://bugzilla.gnome.org/show_bug.cgi?id=770764

 configure.ac                               |    3 ---
 data/Makefile.am                           |    6 +++++-
 data/gnome-user-share-webdav.desktop.in.in |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 247b54a..8486fef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,8 +85,6 @@ fi
 if test "x$exec_prefix" = "xNONE"; then
    exec_prefix=$prefix
 fi
-installdir="`eval echo $libexecdir`"
-AC_SUBST(installdir, $installdir)
 
 dnl ==========================================================================
 IT_PROG_INTLTOOL([0.35.0])
@@ -188,7 +186,6 @@ fi
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/gnome-user-share-webdav.desktop.in
 data/org.gnome.desktop.file-sharing.gschema.xml.in
 po/Makefile.in
 src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 8b89428..3e2f12c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,9 @@ applicationsdir = $(datadir)/applications/
 applications_DATA = $(applications_in_files:.desktop.in=.desktop)
 applications_in_files = gnome-user-share-webdav.desktop.in
 
+gnome-user-share-webdav.desktop.in: gnome-user-share-webdav.desktop.in.in Makefile
+       $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
 appdir = $(datadir)/gnome-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile
 
@@ -31,7 +34,8 @@ EXTRA_DIST = $(app_DATA)  \
 CLEANFILES = $(applications_DATA) \
        $(autostart_DATA) \
        $(gsettings_DATA) \
-       $(systemdservice_DATA)
+       $(systemdservice_DATA) \
+       $(applications_in_files)
 
 DISTCLEANFILES = $(gsettings_DATA)
 
diff --git a/data/gnome-user-share-webdav.desktop.in.in b/data/gnome-user-share-webdav.desktop.in.in
index d7c47c2..ecb88d4 100644
--- a/data/gnome-user-share-webdav.desktop.in.in
+++ b/data/gnome-user-share-webdav.desktop.in.in
@@ -3,7 +3,7 @@ _Name=Personal File Sharing
 _Comment=Launch Personal File Sharing if enabled
 _Keywords=share;files;http;network;copy;send;
 Icon=folder-remote
-Exec=@installdir@/gnome-user-share-webdav
+Exec=@libexecdir@/gnome-user-share-webdav
 Terminal=false
 Type=Application
 Categories=