]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix automake program name transformations
authorRyan Moeller <ryan@ixsystems.com>
Tue, 20 Aug 2019 21:45:26 +0000 (17:45 -0400)
committerRyan Moeller <ryan@ixsystems.com>
Tue, 20 Aug 2019 21:46:40 +0000 (17:46 -0400)
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 <ryan@ixsystems.com>
cmd/arc_summary/Makefile.am

index 7d83624d66d3e1d589dba0de26f9321b26bf437c..e9dbb779a37e525fded1a1205d08dc9748f96dc7 100644 (file)
@@ -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