diff options
| author | Jeff Layton <jlayton@samba.org> | 2012-02-12 07:33:05 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2012-02-12 07:33:05 -0500 |
| commit | c753cfe5491cfb1f1f74ca41444706383ab9f0e3 (patch) | |
| tree | 47d36ba45dcfd5c0c91d3c772ccbc07a431c8b93 | |
| parent | f9524f772c62bbfd7c190b8249ed66990ed3227a (diff) | |
| download | cifs-utils-c753cfe5491cfb1f1f74ca41444706383ab9f0e3.tar.gz cifs-utils-c753cfe5491cfb1f1f74ca41444706383ab9f0e3.tar.bz2 cifs-utils-c753cfe5491cfb1f1f74ca41444706383ab9f0e3.zip | |
cifs-utils: allow specifying rootsbindir at configure time
...via the $ROOTSBINDIR environment variable, and AC_ARG_VAR macro.
The default is to use /sbin for this value, which only currently
affects the installation location of mount.cifs.
Signed-off-by: Jeff Layton <jlayton@samba.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 6182965..924c99e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS = -Wall -Wextra ACLOCAL_AMFLAGS = -I aclocal -root_sbindir = "/sbin" +root_sbindir = $(ROOTSBINDIR) root_sbin_PROGRAMS = mount.cifs mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) diff --git a/configure.ac b/configure.ac index 1923f28..3027eba 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR(aclocal) AM_INIT_AUTOMAKE -# "with" options +# "enable" options AC_ARG_ENABLE(cifsupcall, [AC_HELP_STRING([--enable-cifsupcall], [Create cifs.upcall binary @<:@default=yes@:>@])], @@ -34,6 +34,14 @@ AC_ARG_ENABLE(cifsacl, enable_cifsacl=$enableval, enable_cifsacl="maybe") +# check for ROOTSBINDIR environment var +if test -z $ROOTSBINDIR; then + ROOTSBINDIR="/sbin" + export ROOTSBINDIR +fi + +AC_ARG_VAR(ROOTSBINDIR, [Location where files ordinarily under /sbin should be installed. Note: unaffected by --prefix. @<:@default=/sbin@:>@]) + # Checks for programs. AC_PROG_CC AC_PROG_SED |