Fix 'make distcheck'

In particular this snippet

 giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`

is wrong as it breaks 'make distcheck' unless you can write to where
the gio modules are installed. While this is true for jhbuild setups
it is patently not true for normal setups.

In fact, one could argue that glib's --with-gio-module-dir option is
incompatible with how we build things, but that is more of a GLib
problem.

3 files changed, 19 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index f8ff267b..b53b6a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,8 +57,7 @@ AC_ARG_WITH(dbus_service_dir, [  --with-dbus-service-dir=PATH choose directory f
 DBUS_SERVICE_DIR=$with_dbus_service_dir
 AC_SUBST(DBUS_SERVICE_DIR)
 
-dnl **** gio module path handling ****
-giomodulesdir=`pkg-config --variable=giomoduledir gio-2.0`
+giomodulesdir=$libdir/gio/modules
 AC_SUBST(giomodulesdir)
 
 dnl ****************************
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 9f1b58d6..cff39e34 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -59,3 +59,8 @@ gvfsd_metadata_SOURCES = meta-daemon.c
 servicedir = $(DBUS_SERVICE_DIR)
 service_in_files = gvfs-metadata.service.in
 service_DATA = gvfs-metadata.service
+
+EXTRA_DIST = gvfs-metadata.service.in
+
+clean-local:
+	rm -f gvfs-metadata.service
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b08e385e..d4826eb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,6 +36,10 @@ daemon/gvfsbackendtrash.c
 daemon/gvfschannel.c
 daemon/gvfsdaemon.c
 daemon/gvfsdaemonutils.c
+daemon/gvfsftpconnection.c
+daemon/gvfsftpdircache.c
+daemon/gvfsftpfile.c
+daemon/gvfsftptask.c
 daemon/gvfsjobcloseread.c
 daemon/gvfsjobclosewrite.c
 daemon/gvfsjobcopy.c
@@ -51,6 +55,7 @@ daemon/gvfsjobmove.c
 daemon/gvfsjobopenforread.c
 daemon/gvfsjobopenforwrite.c
 daemon/gvfsjobopeniconforread.c
+daemon/gvfsjobpollmountable.c
 daemon/gvfsjobpull.c
 daemon/gvfsjobpush.c
 daemon/gvfsjobqueryattributes.c
@@ -63,12 +68,19 @@ daemon/gvfsjobseekread.c
 daemon/gvfsjobseekwrite.c
 daemon/gvfsjobsetattribute.c
 daemon/gvfsjobsetdisplayname.c
+daemon/gvfsjobstartmountable.c
+daemon/gvfsjobstopmountable.c
 daemon/gvfsjobtrash.c
 daemon/gvfsjobunmount.c
 daemon/gvfsjobunmountmountable.c
 daemon/gvfsjobwrite.c
 daemon/main.c
 daemon/mount.c
+metadata/meta-daemon.c
+monitor/gdu/gdu-volume-monitor-daemon.c
+monitor/gdu/ggdudrive.c
+monitor/gdu/ggdumount.c
+monitor/gdu/ggduvolume.c
 monitor/gphoto2/ggphoto2volume.c
 monitor/gphoto2/ggphoto2volumemonitor.c
 monitor/gphoto2/hal-utils.c
@@ -88,4 +100,5 @@ programs/gvfs-mkdir.c
 programs/gvfs-move.c
 programs/gvfs-open.c
 programs/gvfs-save.c
+programs/gvfs-set-attribute.c
 programs/gvfs-tree.c