fix

diff --git a/ChangeLog b/ChangeLog
index fbf82dc39fd74a7a32f5d44a98556d09eb0213d9..5103bb1ef1d11a5e30cd66fb515cf05fa6c101b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-26  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Make the installation path of fuse.ko and mount.fuse
+       configurable through INSTALL_MOD_PATH and MOUNT_FUSE_PATH
+       environment variables.  Requirement and help from Csaba Henk.
+
 2005-07-22  Miklos Szeredi <miklos@szeredi.hu>
 
        * Fix bug, that causes filesystem requests to hang when unique

diff --git a/configure.in b/configure.in
index 01fdbd806d90d9e4f3718b33787752e8003eaf52..8c2ea1119c2a5acd6ea4ea87af5d9cb543b0ed11 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,11 @@ fi
 AC_CHECK_FUNCS([setxattr])
 AC_CHECK_MEMBERS([struct stat.st_atim])
 
+if test -z "$MOUNT_FUSE_PATH"; then
+       MOUNT_FUSE_PATH=/sbin
+fi
+AC_SUBST(MOUNT_FUSE_PATH)
+
 AC_SUBST(subdirs2)
 
 AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])

diff --git a/kernel/configure.ac b/kernel/configure.ac
index e968f89541d8c5be5cd2eb97583bce966b920de6..2723693674a9dc5c09f7a6b392bb5ba99ca7f612 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -37,7 +37,7 @@ if test -z "$kernsrcver"; then
 fi
 AC_MSG_RESULT([$kernsrcver])
 majver=`echo "$kernsrcver" | cut -f-2 -d.`
-kmoduledir=/lib/modules/$kernsrcver
+kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver
 AC_SUBST(kernelsrc)
 AC_SUBST(majver)
 AC_SUBST(kmoduledir)

diff --git a/util/Makefile.am b/util/Makefile.am
index 2ac6805722182cbc3f8189412626d5f8d58d7765..54edccb013f18f2ea5e43ea7d472ab526968cc56 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,8 +15,10 @@ install-exec-hook:
 
 EXTRA_DIST = mount.fuse
 
+MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
+
 install-exec-local:
-       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)/sbin/mount.fuse
+       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 
 uninstall-local:
-       rm -f $(DESTDIR)/sbin/mount.fuse
+       rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse