From 963a69860642f594457bcea0ed79778db3b216fb Mon Sep 17 00:00:00 2001
From: Ken McDonell <kenj@kenj.id.au>
Date: Wed, 18 Oct 2023 14:38:18 +1100
Subject: [PATCH] podman and linux_zfs PMDAs: fix previous "help" file changes

Knock-on from removing the root_<pmda> pmns files.
---
 src/pmdas/linux_zfs/GNUmakefile | 10 +++-------
 src/pmdas/podman/GNUmakefile    | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/pmdas/linux_zfs/GNUmakefile b/src/pmdas/linux_zfs/GNUmakefile
index 1f89a07a68..ff41d7cb53 100644
--- a/src/pmdas/linux_zfs/GNUmakefile
+++ b/src/pmdas/linux_zfs/GNUmakefile
@@ -29,8 +29,7 @@ HFILES		= zfs_utils.h zfs_pools.h zfs_zilstats.h zfs_zfetchstats.h zfs_xuiostats
 
 SCRIPTS		= Install Remove
 VERSION_SCRIPT	= exports
-HELPTARGETS	= help.dir help.pag
-LDIRT		= $(HELPTARGETS) domain.h $(VERSION_SCRIPT)
+LDIRT		= domain.h $(VERSION_SCRIPT)
 
 LLDLIBS		= $(PCP_PMDALIB)
 LCFLAGS		= $(INVISIBILITY)
@@ -44,12 +43,12 @@ default:	build-me
 include $(BUILDRULES)
 
 ifeq "$(TARGET_OS)" "linux"
-build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
+build-me: $(LIBTARGET) $(CMDTARGET)
 
 install: default
 	$(INSTALL) -m 755 -d $(PMDAADMDIR)
 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root pmns $(PMDAADMDIR)
+	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help root pmns $(PMDAADMDIR)
 	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
 	@$(INSTALL_MAN)
 else
@@ -61,9 +60,6 @@ default_pcp : default
 
 install_pcp : install
 
-$(HELPTARGETS) : help
-	$(NEWHELP) -n root -v 2 -o help < help
-
 $(VERSION_SCRIPT):
 	$(VERSION_SCRIPT_MAKERULE)
 
diff --git a/src/pmdas/podman/GNUmakefile b/src/pmdas/podman/GNUmakefile
index b6f523ad86..1e7a7fe56d 100644
--- a/src/pmdas/podman/GNUmakefile
+++ b/src/pmdas/podman/GNUmakefile
@@ -37,8 +37,7 @@ LCFLAGS		= -I$(TOPDIR)/src/libpcp_web/src -Ideps
 
 SCRIPTS		= Install Remove
 VERSION_SCRIPT	= exports
-HELPTARGETS	= help.dir help.pag
-LDIRT		= $(HELPTARGETS) domain.h $(VERSION_SCRIPT) $(JSONSL_XFILES)
+LDIRT		= domain.h $(VERSION_SCRIPT) $(JSONSL_XFILES)
 
 MAN_SECTION	= 1
 MAN_PAGES	= pmda$(IAM).$(MAN_SECTION)
@@ -49,12 +48,12 @@ default:	build-me
 include $(BUILDRULES)
 
 ifeq "$(TARGET_OS)" "linux"
-build-me: $(JSONSL_XFILES) $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
+build-me: $(JSONSL_XFILES) $(LIBTARGET) $(CMDTARGET)
 
 install: default
 	$(INSTALL) -m 755 -d $(PMDAADMDIR)
 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root pmns $(PMDAADMDIR)
+	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help root pmns $(PMDAADMDIR)
 	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
 	@$(INSTALL_MAN)
 else
@@ -70,9 +69,6 @@ default_pcp : default
 
 install_pcp : install
 
-$(HELPTARGETS) : help
-	$(NEWHELP) -n root -v 2 -o help < help
-
 $(VERSION_SCRIPT):
 	$(VERSION_SCRIPT_MAKERULE)