diff options
| author | Olivier Blin <olivier.blin@softathome.com> | 2012-07-02 18:50:55 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2012-07-04 12:19:29 +0200 |
| commit | fd4a816823133dd66de60b3a017e1f0442486d1f (patch) | |
| tree | 3c6b5687c691ac834080969e0a2d8d616e007915 | |
| parent | 96ac0e5d76db3714b7c8d37956f6e6b1d804a01a (diff) | |
| download | android_external_fuse-fd4a816823133dd66de60b3a017e1f0442486d1f.tar.gz android_external_fuse-fd4a816823133dd66de60b3a017e1f0442486d1f.tar.bz2 android_external_fuse-fd4a816823133dd66de60b3a017e1f0442486d1f.zip | |
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)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | util/Makefile.am | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 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 \ |