forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve the incorrect use of srcdir and builddir references for various files in the build system. These have crept in over time and went unnoticed because when building in the top level directory srcdir and builddir are identical. With this change it's again possible to build in a subdirectory. $ mkdir obj $ cd obj $ ../configure $ make Reviewed-by: loli10K <ezomori.nozomu@gmail.com> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Don Brady <don.brady@delphix.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#8921 Closes openzfs#8943
- Loading branch information
1 parent
38467a6
commit a9c451f
Showing
11 changed files
with
88 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
include $(top_srcdir)/config/Rules.am | ||
|
||
EXTRA_DIST = \ | ||
README \ | ||
history_event-zfs-list-cacher.sh.in | ||
|
||
zedconfdir = $(sysconfdir)/zfs/zed.d | ||
|
||
dist_zedconf_DATA = \ | ||
zed-functions.sh \ | ||
zed.rc | ||
|
||
zedexecdir = $(zfsexecdir)/zed.d | ||
|
||
dist_zedexec_SCRIPTS = \ | ||
all-debug.sh \ | ||
all-syslog.sh \ | ||
data-notify.sh \ | ||
generic-notify.sh \ | ||
resilver_finish-notify.sh \ | ||
scrub_finish-notify.sh \ | ||
statechange-led.sh \ | ||
statechange-notify.sh \ | ||
vdev_clear-led.sh \ | ||
vdev_attach-led.sh \ | ||
pool_import-led.sh \ | ||
resilver_finish-start-scrub.sh | ||
|
||
nodist_zedexec_SCRIPTS = 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' \ | ||
-e 's,@sysconfdir\@,$(sysconfdir),g' \ | ||
$< >'$@' | ||
|
||
zedconfdefaults = \ | ||
all-syslog.sh \ | ||
data-notify.sh \ | ||
resilver_finish-notify.sh \ | ||
scrub_finish-notify.sh \ | ||
statechange-led.sh \ | ||
statechange-notify.sh \ | ||
vdev_clear-led.sh \ | ||
vdev_attach-led.sh \ | ||
pool_import-led.sh \ | ||
resilver_finish-start-scrub.sh | ||
|
||
install-data-hook: | ||
$(MKDIR_P) "$(DESTDIR)$(zedconfdir)" | ||
for f in $(zedconfdefaults); do \ | ||
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ | ||
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \ | ||
ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \ | ||
done | ||
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,5 @@ | ||
pkgdatadir = $(datadir)/@PACKAGE@/runfiles | ||
dist_pkgdata_DATA = *.run | ||
dist_pkgdata_DATA = \ | ||
linux.run \ | ||
longevity.run \ | ||
perf-regression.run |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters