From: Ryan Moeller Date: Tue, 20 Aug 2019 21:45:26 +0000 (-0400) Subject: Fix automake program name transformations X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92a9e1da60f760380220624db2681b72ffff9a0b;p=zfs Fix automake program name transformations Automake can perform program name transformations at install time. However, arc_summary has its own name transformation taking place, which interferes with the automake transforms. The automake transforms must be taken into account in order to resolve the conflict. Signed-off-by: Ryan Moeller --- diff --git a/cmd/arc_summary/Makefile.am b/cmd/arc_summary/Makefile.am index 7d83624d6..e9dbb779a 100644 --- a/cmd/arc_summary/Makefile.am +++ b/cmd/arc_summary/Makefile.am @@ -1,11 +1,17 @@ EXTRA_DIST = arc_summary2 arc_summary3 +transform = $(program_transform_name) + if USING_PYTHON_2 dist_bin_SCRIPTS = arc_summary2 install-exec-hook: - mv $(DESTDIR)$(bindir)/arc_summary2 $(DESTDIR)$(bindir)/arc_summary + before=$$(echo arc_summary2 | sed '$(transform)'); \ + after=$$(echo arc_summary | sed '$(transform)'); \ + mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" else dist_bin_SCRIPTS = arc_summary3 install-exec-hook: - mv $(DESTDIR)$(bindir)/arc_summary3 $(DESTDIR)$(bindir)/arc_summary + before=$$(echo arc_summary3 | sed '$(transform)'); \ + after=$$(echo arc_summary | sed '$(transform)'); \ + mv "$(DESTDIR)$(bindir)/$$before" "$(DESTDIR)$(bindir)/$$after" endif