Fix install from out-of-tree build

When building out-of-tree, install fails since it tries to copy
mount.fuse binary from source directory.

Patch initially from Damien Thébault (SoftAtHome)

diff --git a/ChangeLog b/ChangeLog
index d465b3cbc946b0368b1e01a4787d22be3ebd1b40..e58bec4222aafccb449861f3322e40ffa148953d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-04  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix install of mount.fuse from out-of-tree build.  Patch by
+       Olivier Blin
+
 2012-04-24  Miklos Szeredi <miklos@szeredi.hu>
 
        * Add fallocate operation.  Patch by Anatol Pomozov

diff --git a/util/Makefile.am b/util/Makefile.am
index 927b98c07fdb6442b6b3bd2f8c820e780869c2e6..b036164386cbff19b937d2b8d1a56bf69b4c1fb0 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -36,7 +36,7 @@ INIT_D_PATH = @INIT_D_PATH@
 
 install-exec-local:
        $(mkdir_p) $(DESTDIR)$(MOUNT_FUSE_PATH)
-       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+       $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
        $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
        $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
        @if test -x /usr/sbin/update-rc.d; then \