diff options
| author | Arvind Sankar <[email protected]> | 2020-06-22 12:08:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-06-24 18:19:59 -0700 |
| commit | 5ca349f95d836a2a59aceaa42715349749a43865 (patch) | |
| tree | be50955e04b975abf037dd862c2cc3d9ee13cea5 /Makefile.am | |
| parent | 9642beef2b415e52638c469563f3addc30a024dc (diff) | |
Fix check for sed --in-place
The test added in commit
4313a5b4c51e ("Detect if sed supports --in-place")
doesn't work at least on my system (autoconfig-2.69).
The issue is that SED has already been found and cached before this
function is evaluated, with the result that the test is completely
skipped.
...
checking for a sed that does not truncate output... /usr/bin/sed
...
checking for sed --in-place... (cached) /usr/bin/sed
The first test is executed by libtool.m4. This looks to have been around
in libtool for at least 15 years or so, not sure why this was not
encountered at the time of the original commit.
Fix this by caching the value of the ac_inplace flag rather than the
path to SED. Also use $SED and add AC_REQUIRE to ensure that we use the
sed that was located by the standard configure test.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10493
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 3e2d6e4dc..6ba5ac388 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ all-local: ${top_builddir}/scripts/zfs-tests.sh -c dist-hook: - sed ${ac_inplace} -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \ + $(SED) ${ac_inplace} -e 's/Release:[[:print:]]*/Release: $(RELEASE)/' \ $(distdir)/META if BUILD_LINUX |