diff options
| author | Antonio Russo <[email protected]> | 2018-06-07 12:59:59 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-06-07 09:59:59 -0700 |
| commit | 39042f97365c0e677e5e77ded90372526422afdf (patch) | |
| tree | feaf6e681cc3b9bd677bfd442b4e54e14c1b8a33 /config | |
| parent | fba33c3819761487a75c8f1307482959105a6269 (diff) | |
Tunable directory for zfs runtime scripts
zpool and zed place scripts in subdirectories of libexecdir. Some
distributions locate architecture independent scripts in other locations
(e.g. Debian). To avoid these paths getting out of sync, centralize the
definitions.
Build zfs-test's default.cfg by Makefile. Use the new directory
logic building tests/zfs-tests/include/default.cfg.in.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Antonio Russo <[email protected]>
Closes #7597
Diffstat (limited to 'config')
| -rw-r--r-- | config/user-libexec.m4 | 9 | ||||
| -rw-r--r-- | config/user.m4 | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/user-libexec.m4 b/config/user-libexec.m4 new file mode 100644 index 000000000..31bcea3fc --- /dev/null +++ b/config/user-libexec.m4 @@ -0,0 +1,9 @@ +AC_DEFUN([ZFS_AC_CONFIG_USER_ZFSEXEC], [ + AC_ARG_WITH(zfsexecdir, + AC_HELP_STRING([--with-zfsexecdir=DIR], + [install scripts [[@<:@libexecdir@:>@/zfs]]]), + [zfsexecdir=$withval], + [zfsexecdir="${libexecdir}/zfs"]) + + AC_SUBST([zfsexecdir]) +]) diff --git a/config/user.m4 b/config/user.m4 index f2f366e3c..8c4655719 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -17,6 +17,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_RUNSTATEDIR ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV + ZFS_AC_CONFIG_USER_ZFSEXEC ZFS_AC_TEST_FRAMEWORK |