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 /cmd/zed | |
| 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 'cmd/zed')
| -rw-r--r-- | cmd/zed/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am index e9e38d8e5..9c11315f2 100644 --- a/cmd/zed/Makefile.am +++ b/cmd/zed/Makefile.am @@ -54,14 +54,13 @@ dist_zedconf_DATA = \ zed.d/zed-functions.sh \ zed.d/zed.rc -zedexecdir = $(libexecdir)/zfs/zed.d +zedexecdir = $(zfsexecdir)/zed.d dist_zedexec_SCRIPTS = \ zed.d/all-debug.sh \ zed.d/all-syslog.sh \ zed.d/data-notify.sh \ zed.d/generic-notify.sh \ - zed.d/history_event-zfs-list-cacher.sh \ zed.d/resilver_finish-notify.sh \ zed.d/scrub_finish-notify.sh \ zed.d/statechange-led.sh \ @@ -71,7 +70,9 @@ dist_zedexec_SCRIPTS = \ zed.d/pool_import-led.sh \ zed.d/resilver_finish-start-scrub.sh -zed.d/history_event-zfs-list-cacher.sh: %: %.in +nodist_zedexec_SCRIPTS = zed.d/history_event-zfs-list-cacher.sh + +$(nodist_zedexec_SCRIPTS): %: %.in -$(SED) -e 's,@bindir\@,$(bindir),g' \ -e 's,@runstatedir\@,$(runstatedir),g' \ -e 's,@sbindir\@,$(sbindir),g' \ |