From bfb99462fae3bd64394ca2fc7befaa02af65f534 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 26 Jul 2005 11:07:55 +0000 Subject: [PATCH] fix --- ChangeLog | 6 ++++++ configure.in | 5 +++++ kernel/configure.ac | 2 +- util/Makefile.am | 6 ++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbf82dc..5103bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-26 Miklos Szeredi + + * 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 * Fix bug, that causes filesystem requests to hang when unique diff --git a/configure.in b/configure.in index 01fdbd8..8c2ea11 100644 --- 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 e968f89..2723693 100644 --- 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 2ac6805..54edccb 100644 --- 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 -- 2.30.2