diff options
Diffstat (limited to 'tests/zfs-tests')
| -rw-r--r-- | tests/zfs-tests/include/Makefile.am | 10 | ||||
| -rw-r--r-- | tests/zfs-tests/include/default.cfg.in | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am index 52e1c0a9f..41e105287 100644 --- a/tests/zfs-tests/include/Makefile.am +++ b/tests/zfs-tests/include/Makefile.am @@ -2,13 +2,19 @@ pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include dist_pkgdata_DATA = \ blkdev.shlib \ commands.cfg \ - default.cfg \ libtest.shlib \ math.shlib \ properties.shlib \ zpool_script.shlib -EXTRA_DIST=default.cfg.in +EXTRA_DIST = default.cfg.in + +nodist_pkgdata_DATA = default.cfg + +$(nodist_pkgdata_DATA): %: %.in + -$(SED) -e 's,@zfsexecdir\@,$(zfsexecdir),g' \ + -e 's,@sysconfdir\@,$(sysconfdir),g' \ + $< >'$@' distclean-local:: -$(RM) default.cfg diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in index 90d1d8bd6..e1e2a7e91 100644 --- a/tests/zfs-tests/include/default.cfg.in +++ b/tests/zfs-tests/include/default.cfg.in @@ -33,10 +33,8 @@ . $STF_SUITE/include/libtest.shlib # ZFS Directories -export prefix=@prefix@ -export exec_prefix=@exec_prefix@ export ZEDLET_ETC_DIR=${ZEDLET_ETC_DIR:-@sysconfdir@/zfs/zed.d} -export ZEDLET_LIBEXEC_DIR=${ZEDLET_LIBEXEC_DIR:-@libexecdir@/zfs/zed.d} +export ZEDLET_LIBEXEC_DIR=${ZEDLET_LIBEXEC_DIR:-@zfsexecdir@/zed.d} export ZPOOL_SCRIPT_DIR=${ZPOOL_SCRIPT_DIR:-@sysconfdir@/zfs/zpool.d} # Define run length constants |