diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | daemon/Makefile.am | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2008-01-03 Matthias Clasen <mclasen@redhat.com> + + * daemon/Makefile.am: Install the .mount files + in /usr/share/gvfs/mounts, not in /etc/gvfs/mounts + 2008-01-03 Alexander Larsson <alexl@redhat.com> * hal/ghalvolumemonitor.c: diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 37ad5bbc..2762220d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,5 +1,7 @@ NULL = +mountdir = $(datadir)/gvfs/mounts + INCLUDES = \ $(SAMBA_CFLAGS) \ -I$(top_srcdir) \ @@ -7,7 +9,7 @@ INCLUDES = \ -I$(top_builddir) \ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE \ - -DMOUNTABLE_DIR=\"$(sysconfdir)/gvfs/mounts/\" \ + -DMOUNTABLE_DIR=\"$(mountdir)/\" \ -DG_DISABLE_DEPRECATED noinst_LTLIBRARIES=libdaemon.la @@ -28,8 +30,6 @@ service_DATA = gvfs-daemon.service %.mount: %.mount.in ../config.log sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -mountdir = $(sysconfdir)/gvfs/mounts - libexec_PROGRAMS=gvfsd gvfsd-ftp gvfsd-sftp gvfsd-trash mount_in_files = ftp.mount.in sftp.mount.in trash.mount.in |