diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2005-07-26 11:07:55 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2005-07-26 11:07:55 +0000 |
| commit | bfb99462fae3bd64394ca2fc7befaa02af65f534 (patch) | |
| tree | a614d3bc7f8406f823159de178af276ccc524387 | |
| parent | f0c8b11fac31261c62c7035d4c2a7ec0aba86122 (diff) | |
| download | libfuse-bfb99462fae3bd64394ca2fc7befaa02af65f534.tar.gz | |
fix
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | kernel/configure.ac | 2 | ||||
| -rw-r--r-- | util/Makefile.am | 6 |
4 files changed, 16 insertions, 3 deletions
@@ -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 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 |