From fd4a816823133dd66de60b3a017e1f0442486d1f Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 2 Jul 2012 18:50:55 +0200 Subject: Fix install from out-of-tree build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- ChangeLog | 5 +++++ util/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d465b3c..e58bec4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-07-04 Miklos Szeredi + + * Fix install of mount.fuse from out-of-tree build. Patch by + Olivier Blin + 2012-04-24 Miklos Szeredi * Add fallocate operation. Patch by Anatol Pomozov diff --git a/util/Makefile.am b/util/Makefile.am index 927b98c..b036164 100644 --- 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 \ -- cgit v1.2.3