diff options
| author |  Todd Zullinger | 2009-05-11 15:24:09 -0400 |
|---|---|---|
| committer |  Matt Colyer | 2009-05-11 20:29:46 -0700 |
| commit | 9da6bc0c7e9cf7d5d458bbb9d3ef607757f2f48d (patch) | |
| tree | 357f1397ca251b50a7b258751ae7694e7dd99b3d | |
| parent | f3dbc12d4494da2fab11791ab73de60b06e79e8c (diff) | |
| download | ifuse-9da6bc0c7e9cf7d5d458bbb9d3ef607757f2f48d.tar.gz ifuse-9da6bc0c7e9cf7d5d458bbb9d3ef607757f2f48d.tar.bz2 | |
Fix 'make distcheck'0.9.1
mount.fuse.ifuse needs to be installed in /sbin by default, but this
breaks 'make distcheck'. This adds a --disable-root-sbin option to
configure and uses it when running 'make distcheck'.
Signed-off-by: Matt Colyer <matt@colyer.name>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aabfa91..70e1c93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src fdi +DISTCHECK_CONFIGURE_FLAGS = --disable-root-sbin + indent: indent -kr -ut -ts4 -l120 src/*.c diff --git a/configure.ac b/configure.ac index 684dcce..fdc35ed 100644 --- a/configure.ac +++ b/configure.ac @@ -34,4 +34,10 @@ AC_FUNC_MALLOC AC_FUNC_REALLOC AC_CHECK_FUNCS([strcasecmp strdup strerror strndup]) +AC_ARG_ENABLE([root-sbin], + AS_HELP_STRING([--disable-root-sbin], + [Don't install mount helper in /sbin]), + [without_root_sbin=yes],[without_root_sbin=no]) +AM_CONDITIONAL([WITHOUT_ROOT_SBIN], test "x$without_root_sbin" = "xyes") + AC_OUTPUT(Makefile src/Makefile fdi/Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 17798c6..11f2815 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,11 @@ AM_CFLAGS = $(libglib2_CFLAGS) $(libfuse_CFLAGS) $(libiphone_CFLAGS) -g AM_LDFLAGS = $(libglib2_LIBS) $(libfuse_LIBS) $(libiphone_LIBS) +if WITHOUT_ROOT_SBIN +rootsbinexecdir = $(sbindir) +else rootsbinexecdir = /sbin +endif rootsbinexec_PROGRAMS = mount.fuse.ifuse mount_fuse_ifuse_SOURCES = ifuse.c |