$NetBSD: patch-bk,v 1.2 2010/09/27 12:01:49 taca Exp $

* Nuke removing existing files.

--- conf/makefiles/doc.orig	1999-02-09 11:30:00.000000000 +0000
+++ conf/makefiles/doc
@@ -36,6 +36,7 @@ inst-options2=	inst-cipher inst-decipher
 Toptions2=	cipher.man decipher.man tma.man
 @END: TMA
 REMOVE	=	@(MHREMOVE)
+CP      =       @(CP)
 MANPROT	=	0644
 
 MAN1	=	ali.$(EXT1) anno.$(EXT1) burst.$(EXT1) comp.$(EXT1) \
@@ -301,8 +302,7 @@ $(JMANDIR)/$(DIR1) $(JMANDIR)/$(DIR5) $(
 inst-tmac:	$(ETCDIR)/tmac.h
 
 $(ETCDIR)/tmac.h:	tmac.h
-		-$(REMOVE) $@ ztmac.h
-		cp tmac.h $@
+		$(CP) tmac.h $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -311,8 +311,7 @@ $(ETCDIR)/tmac.h:	tmac.h
 inst-ali:	$(MANDIR)/$(DIR1)/ali.$(EXT1)
 
 $(MANDIR)/$(DIR1)/ali.$(EXT1):	ali.man
-		-$(REMOVE) $@ zali.man
-		cp ali.man $@
+		$(CP) ali.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -320,8 +319,7 @@ $(MANDIR)/$(DIR1)/ali.$(EXT1):	ali.man
 inst-anno:	$(MANDIR)/$(DIR1)/anno.$(EXT1)
 
 $(MANDIR)/$(DIR1)/anno.$(EXT1):	anno.man
-		-$(REMOVE) $@ zanno.man
-		cp anno.man $@
+		$(CP) anno.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -329,8 +327,7 @@ $(MANDIR)/$(DIR1)/anno.$(EXT1):	anno.man
 inst-ap:	$(MANDIR)/$(DIR8)/ap.$(EXT8)
 
 $(MANDIR)/$(DIR8)/ap.$(EXT8):	ap.man
-		-$(REMOVE) $@ zap.man
-		cp ap.man $@
+		$(CP) ap.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -338,8 +335,7 @@ $(MANDIR)/$(DIR8)/ap.$(EXT8):	ap.man
 inst-bbc:	$(MANDIR)/$(DIR1)/bbc.$(EXT1)
 
 $(MANDIR)/$(DIR1)/bbc.$(EXT1):	bbc.man
-		-$(REMOVE) $@ zbbc.man
-		cp bbc.man $@
+		$(CP) bbc.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -347,8 +343,7 @@ $(MANDIR)/$(DIR1)/bbc.$(EXT1):	bbc.man
 inst-bbl:	$(MANDIR)/$(DIR1)/bbl.$(EXT1)
 
 $(MANDIR)/$(DIR1)/bbl.$(EXT1):	bbl.man
-		-$(REMOVE) $@ zbbl.man
-		cp bbl.man $@
+		$(CP) bbl.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -356,8 +351,7 @@ $(MANDIR)/$(DIR1)/bbl.$(EXT1):	bbl.man
 inst-bbleader:	$(MANDIR)/$(DIR1)/bbleader.$(EXT1)
 
 $(MANDIR)/$(DIR1)/bbleader.$(EXT1):	bbleader.man
-		-$(REMOVE) $@ zbbleader.man
-		cp bbleader.man $@
+		$(CP) bbleader.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -365,8 +359,7 @@ $(MANDIR)/$(DIR1)/bbleader.$(EXT1):	bble
 inst-bboards:	$(MANDIR)/$(DIR1)/bboards.$(EXT1)
 
 $(MANDIR)/$(DIR1)/bboards.$(EXT1):	bboards.man
-		-$(REMOVE) $@ zbboards.man
-		cp bboards.man $@
+		$(CP) bboards.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -374,8 +367,7 @@ $(MANDIR)/$(DIR1)/bboards.$(EXT1):	bboar
 inst-burst:	$(MANDIR)/$(DIR1)/burst.$(EXT1)
 
 $(MANDIR)/$(DIR1)/burst.$(EXT1):	burst.man
-		-$(REMOVE) $@ zburst.man
-		cp burst.man $@
+		$(CP) burst.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -383,8 +375,7 @@ $(MANDIR)/$(DIR1)/burst.$(EXT1):	burst.m
 inst-cipher:	$(MANDIR)/$(DIR1)/cipher.$(EXT1)
 
 $(MANDIR)/$(DIR1)/cipher.$(EXT1):	cipher.man
-		-$(REMOVE) $@ zcipher.man
-		cp cipher.man $@
+		$(CP) cipher.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -392,8 +383,7 @@ $(MANDIR)/$(DIR1)/cipher.$(EXT1):	cipher
 inst-comp:	$(MANDIR)/$(DIR1)/comp.$(EXT1)
 
 $(MANDIR)/$(DIR1)/comp.$(EXT1):	comp.man
-		-$(REMOVE) $@ zcomp.man
-		cp comp.man $@
+		$(CP) comp.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -401,8 +391,7 @@ $(MANDIR)/$(DIR1)/comp.$(EXT1):	comp.man
 inst-conflict:	$(MANDIR)/$(DIR8)/conflict.$(EXT8)
 
 $(MANDIR)/$(DIR8)/conflict.$(EXT8):	conflict.man
-		-$(REMOVE) $@ zconflict.man
-		cp conflict.man $@
+		$(CP) conflict.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -410,8 +399,7 @@ $(MANDIR)/$(DIR8)/conflict.$(EXT8):	conf
 inst-decipher:	$(MANDIR)/$(DIR1)/decipher.$(EXT1)
 
 $(MANDIR)/$(DIR1)/decipher.$(EXT1):	decipher.man
-		-$(REMOVE) $@ zdecipher.man
-		cp decipher.man $@
+		$(CP) decipher.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -419,8 +407,7 @@ $(MANDIR)/$(DIR1)/decipher.$(EXT1):	deci
 inst-dist:	$(MANDIR)/$(DIR1)/dist.$(EXT1)
 
 $(MANDIR)/$(DIR1)/dist.$(EXT1):	dist.man
-		-$(REMOVE) $@ zdist.man
-		cp dist.man $@
+		$(CP) dist.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -428,8 +415,7 @@ $(MANDIR)/$(DIR1)/dist.$(EXT1):	dist.man
 inst-dp:	$(MANDIR)/$(DIR8)/dp.$(EXT8)
 
 $(MANDIR)/$(DIR8)/dp.$(EXT8):	dp.man
-		-$(REMOVE) $@ zdp.man
-		cp dp.man $@
+		$(CP) dp.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -437,8 +423,7 @@ $(MANDIR)/$(DIR8)/dp.$(EXT8):	dp.man
 inst-folder:	$(MANDIR)/$(DIR1)/folder.$(EXT1)
 
 $(MANDIR)/$(DIR1)/folder.$(EXT1):	folder.man
-		-$(REMOVE) $@ zfolder.man
-		cp folder.man $@
+		$(CP) folder.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -446,8 +431,7 @@ $(MANDIR)/$(DIR1)/folder.$(EXT1):	folder
 inst-fmtdump:	$(MANDIR)/$(DIR8)/fmtdump.$(EXT8)
 
 $(MANDIR)/$(DIR8)/fmtdump.$(EXT8):	fmtdump.man
-		-$(REMOVE) $@ zfmtdump.man
-		cp fmtdump.man $@
+		$(CP) fmtdump.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -455,8 +439,7 @@ $(MANDIR)/$(DIR8)/fmtdump.$(EXT8):	fmtdu
 inst-forw:	$(MANDIR)/$(DIR1)/forw.$(EXT1)
 
 $(MANDIR)/$(DIR1)/forw.$(EXT1):	forw.man
-		-$(REMOVE) $@ zforw.man
-		cp forw.man $@
+		$(CP) forw.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -464,8 +447,7 @@ $(MANDIR)/$(DIR1)/forw.$(EXT1):	forw.man
 inst-inc:	$(MANDIR)/$(DIR1)/inc.$(EXT1)
 
 $(MANDIR)/$(DIR1)/inc.$(EXT1):	inc.man
-		-$(REMOVE) $@ zinc.man
-		cp inc.man $@
+		$(CP) inc.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -473,8 +455,7 @@ $(MANDIR)/$(DIR1)/inc.$(EXT1):	inc.man
 inst-install-mh: $(MANDIR)/$(DIR8)/install-mh.$(EXT8)
 
 $(MANDIR)/$(DIR8)/install-mh.$(EXT8): install-mh.man
-		-$(REMOVE) $@ zinstall-mh.man
-		cp install-mh.man $@
+		$(CP) install-mh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -482,8 +463,7 @@ $(MANDIR)/$(DIR8)/install-mh.$(EXT8): in
 inst-mark:	$(MANDIR)/$(DIR1)/mark.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mark.$(EXT1):	mark.man
-		-$(REMOVE) $@ zmark.man
-		cp mark.man $@
+		$(CP) mark.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -491,8 +471,7 @@ $(MANDIR)/$(DIR1)/mark.$(EXT1):	mark.man
 inst-mh-alias:	$(MANDIR)/$(DIR5)/mh-alias.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-alias.$(EXT5):	mh-alias.man
-		-$(REMOVE) $@ zmh-alias.man
-		cp mh-alias.man $@
+		$(CP) mh-alias.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -500,8 +479,7 @@ $(MANDIR)/$(DIR5)/mh-alias.$(EXT5):	mh-a
 inst-mh-format:	$(MANDIR)/$(DIR5)/mh-format.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-format.$(EXT5):	mh-format.man
-		-$(REMOVE) $@ zmh-format.man
-		cp mh-format.man $@
+		$(CP) mh-format.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -509,8 +487,7 @@ $(MANDIR)/$(DIR5)/mh-format.$(EXT5):	mh-
 inst-mh-chart:	$(MANDIR)/$(DIR1)/mh-chart.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mh-chart.$(EXT1):	mh-chart.man
-		-$(REMOVE) $@ zmh-chart.man
-		cp mh-chart.man $@
+		$(CP) mh-chart.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -518,8 +495,7 @@ $(MANDIR)/$(DIR1)/mh-chart.$(EXT1):	mh-c
 inst-mh-mail:	$(MANDIR)/$(DIR5)/mh-mail.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-mail.$(EXT5):	mh-mail.man
-		-$(REMOVE) $@ zmh-mail.man
-		cp mh-mail.man $@
+		$(CP) mh-mail.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -527,8 +503,7 @@ $(MANDIR)/$(DIR5)/mh-mail.$(EXT5):	mh-ma
 inst-mh-tailor:	$(MANDIR)/$(DIR5)/mh-tailor.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-tailor.$(EXT5):	mh-tailor.man
-		-$(REMOVE) $@ zmh-tailor.man
-		cp mh-tailor.man $@
+		$(CP) mh-tailor.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -536,8 +511,7 @@ $(MANDIR)/$(DIR5)/mh-tailor.$(EXT5):	mh-
 inst-mh-profile:	$(MANDIR)/$(DIR5)/mh-profile.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-profile.$(EXT5):	mh-profile.man
-		-$(REMOVE) $@ zmh-profile.man
-		cp mh-profile.man $@
+		$(CP) mh-profile.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -545,8 +519,7 @@ $(MANDIR)/$(DIR5)/mh-profile.$(EXT5):	mh
 inst-mh-sequence:	$(MANDIR)/$(DIR5)/mh-sequence.$(EXT5)
 
 $(MANDIR)/$(DIR5)/mh-sequence.$(EXT5):	mh-sequence.man
-		-$(REMOVE) $@ zmh-sequence.man
-		cp mh-sequence.man $@
+		$(CP) mh-sequence.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -554,8 +527,7 @@ $(MANDIR)/$(DIR5)/mh-sequence.$(EXT5):	m
 inst-mhook:	$(MANDIR)/$(DIR1)/mhook.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhook.$(EXT1):	mhook.man
-		-$(REMOVE) $@ zmhook.man
-		cp mhook.man $@
+		$(CP) mhook.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -563,8 +535,7 @@ $(MANDIR)/$(DIR1)/mhook.$(EXT1):	mhook.m
 inst-mh:	$(MANDIR)/$(DIR1)/mh.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mh.$(EXT1):	mh.man
-		-$(REMOVE) $@ zmh.man
-		cp mh.man $@
+		$(CP) mh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -572,8 +543,7 @@ $(MANDIR)/$(DIR1)/mh.$(EXT1):	mh.man
 inst-mhl:	$(MANDIR)/$(DIR1)/mhl.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhl.$(EXT1):	mhl.man
-		-$(REMOVE) $@ zmhl.man
-		cp mhl.man $@
+		$(CP) mhl.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -581,8 +551,7 @@ $(MANDIR)/$(DIR1)/mhl.$(EXT1):	mhl.man
 inst-mhmail:	$(MANDIR)/$(DIR1)/mhmail.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhmail.$(EXT1):	mhmail.man
-		-$(REMOVE) $@ zmhmail.man
-		cp mhmail.man $@
+		$(CP) mhmail.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -590,8 +559,7 @@ $(MANDIR)/$(DIR1)/mhmail.$(EXT1):	mhmail
 inst-mhn:	$(MANDIR)/$(DIR1)/mhn.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhn.$(EXT1):	mhn.man
-		-$(REMOVE) $@ zmhn.man
-		cp mhn.man $@
+		$(CP) mhn.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -599,8 +567,7 @@ $(MANDIR)/$(DIR1)/mhn.$(EXT1):	mhn.man
 inst-mhparam:	$(MANDIR)/$(DIR1)/mhparam.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhparam.$(EXT1):	mhparam.man
-		-$(REMOVE) $@ zmhparam.man
-		cp mhparam.man $@
+		$(CP) mhparam.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -608,8 +575,7 @@ $(MANDIR)/$(DIR1)/mhparam.$(EXT1):	mhpar
 inst-mhpath:	$(MANDIR)/$(DIR1)/mhpath.$(EXT1)
 
 $(MANDIR)/$(DIR1)/mhpath.$(EXT1):	mhpath.man
-		-$(REMOVE) $@ zmhpath.man
-		cp mhpath.man $@
+		$(CP) mhpath.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -617,8 +583,7 @@ $(MANDIR)/$(DIR1)/mhpath.$(EXT1):	mhpath
 inst-msgchk:	$(MANDIR)/$(DIR1)/msgchk.$(EXT1)
 
 $(MANDIR)/$(DIR1)/msgchk.$(EXT1):	msgchk.man
-		-$(REMOVE) $@ zmsgchk.man
-		cp msgchk.man $@
+		$(CP) msgchk.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -626,8 +591,7 @@ $(MANDIR)/$(DIR1)/msgchk.$(EXT1):	msgchk
 inst-msh:	$(MANDIR)/$(DIR1)/msh.$(EXT1)
 
 $(MANDIR)/$(DIR1)/msh.$(EXT1):	msh.man
-		-$(REMOVE) $@ zmsh.man
-		cp msh.man $@
+		$(CP) msh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -635,8 +599,7 @@ $(MANDIR)/$(DIR1)/msh.$(EXT1):	msh.man
 inst-next:	$(MANDIR)/$(DIR1)/next.$(EXT1)
 
 $(MANDIR)/$(DIR1)/next.$(EXT1):	next.man
-		-$(REMOVE) $@ znext.man
-		cp next.man $@
+		$(CP) next.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -644,8 +607,7 @@ $(MANDIR)/$(DIR1)/next.$(EXT1):	next.man
 inst-packf:	$(MANDIR)/$(DIR1)/packf.$(EXT1)
 
 $(MANDIR)/$(DIR1)/packf.$(EXT1):	packf.man
-		-$(REMOVE) $@ zpackf.man
-		cp packf.man $@
+		$(CP) packf.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -653,8 +615,7 @@ $(MANDIR)/$(DIR1)/packf.$(EXT1):	packf.m
 inst-pgped:	$(MANDIR)/$(DIR1)/pgped.$(EXT1)
 
 $(MANDIR)/$(DIR1)/pgped.$(EXT1):	pgped.man
-		-$(REMOVE) $@ zpgped.man
-		cp pgped.man $@
+		$(CP) pgped.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -662,8 +623,7 @@ $(MANDIR)/$(DIR1)/pgped.$(EXT1):	pgped.m
 inst-popauth:	$(MANDIR)/$(DIR8)/popauth.$(EXT8)
 
 $(MANDIR)/$(DIR8)/popauth.$(EXT8):	popauth.man
-		-$(REMOVE) $@ zpopauth.man
-		cp popauth.man $@
+		$(CP) popauth.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -671,8 +631,7 @@ $(MANDIR)/$(DIR8)/popauth.$(EXT8):	popau
 inst-popd:	$(MANDIR)/$(DIR8)/popd.$(EXT8)
 
 $(MANDIR)/$(DIR8)/popd.$(EXT8):	popd.man
-		-$(REMOVE) $@ zpopd.man
-		cp popd.man $@
+		$(CP) popd.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -680,8 +639,7 @@ $(MANDIR)/$(DIR8)/popd.$(EXT8):	popd.man
 inst-popi:	$(MANDIR)/$(DIR1)/popi.$(EXT1)
 
 $(MANDIR)/$(DIR1)/popi.$(EXT1):	popi.man
-		-$(REMOVE) $@ zpopi.man
-		cp popi.man $@
+		$(CP) popi.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -689,8 +647,7 @@ $(MANDIR)/$(DIR1)/popi.$(EXT1):	popi.man
 inst-pick:	$(MANDIR)/$(DIR1)/pick.$(EXT1)
 
 $(MANDIR)/$(DIR1)/pick.$(EXT1):	pick.man
-		-$(REMOVE) $@ zpick.man
-		cp pick.man $@
+		$(CP) pick.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -698,8 +655,7 @@ $(MANDIR)/$(DIR1)/pick.$(EXT1):	pick.man
 inst-post:	$(MANDIR)/$(DIR8)/post.$(EXT8)
 
 $(MANDIR)/$(DIR8)/post.$(EXT8):	post.man
-		-$(REMOVE) $@ zpost.man
-		cp post.man $@
+		$(CP) post.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -707,8 +663,7 @@ $(MANDIR)/$(DIR8)/post.$(EXT8):	post.man
 inst-prev:	$(MANDIR)/$(DIR1)/prev.$(EXT1)
 
 $(MANDIR)/$(DIR1)/prev.$(EXT1):	prev.man
-		-$(REMOVE) $@ zprev.man
-		cp prev.man $@
+		$(CP) prev.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -716,8 +671,7 @@ $(MANDIR)/$(DIR1)/prev.$(EXT1):	prev.man
 inst-prompter:	$(MANDIR)/$(DIR1)/prompter.$(EXT1)
 
 $(MANDIR)/$(DIR1)/prompter.$(EXT1):	prompter.man
-		-$(REMOVE) $@ zprompter.man
-		cp prompter.man $@
+		$(CP) prompter.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -725,8 +679,7 @@ $(MANDIR)/$(DIR1)/prompter.$(EXT1):	prom
 inst-rcvstore:	$(MANDIR)/$(DIR1)/rcvstore.$(EXT1)
 
 $(MANDIR)/$(DIR1)/rcvstore.$(EXT1):	rcvstore.man
-		-$(REMOVE) $@ zrcvstore.man
-		cp rcvstore.man $@
+		$(CP) rcvstore.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -734,8 +687,7 @@ $(MANDIR)/$(DIR1)/rcvstore.$(EXT1):	rcvs
 inst-refile:	$(MANDIR)/$(DIR1)/refile.$(EXT1)
 
 $(MANDIR)/$(DIR1)/refile.$(EXT1):	refile.man
-		-$(REMOVE) $@ zrefile.man
-		cp refile.man $@
+		$(CP) refile.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -743,8 +695,7 @@ $(MANDIR)/$(DIR1)/refile.$(EXT1):	refile
 inst-repl:	$(MANDIR)/$(DIR1)/repl.$(EXT1)
 
 $(MANDIR)/$(DIR1)/repl.$(EXT1):	repl.man
-		-$(REMOVE) $@ zrepl.man
-		cp repl.man $@
+		$(CP) repl.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -752,8 +703,7 @@ $(MANDIR)/$(DIR1)/repl.$(EXT1):	repl.man
 inst-rmm:	$(MANDIR)/$(DIR1)/rmm.$(EXT1)
 
 $(MANDIR)/$(DIR1)/rmm.$(EXT1):	rmm.man
-		-$(REMOVE) $@ zrmm.man
-		cp rmm.man $@
+		$(CP) rmm.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -761,8 +711,7 @@ $(MANDIR)/$(DIR1)/rmm.$(EXT1):	rmm.man
 inst-rmf:	$(MANDIR)/$(DIR1)/rmf.$(EXT1)
 
 $(MANDIR)/$(DIR1)/rmf.$(EXT1):	rmf.man
-		-$(REMOVE) $@ zrmf.man
-		cp rmf.man $@
+		$(CP) rmf.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -770,8 +719,7 @@ $(MANDIR)/$(DIR1)/rmf.$(EXT1):	rmf.man
 inst-scan:	$(MANDIR)/$(DIR1)/scan.$(EXT1)
 
 $(MANDIR)/$(DIR1)/scan.$(EXT1):	scan.man
-		-$(REMOVE) $@ zscan.man
-		cp scan.man $@
+		$(CP) scan.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -779,8 +727,7 @@ $(MANDIR)/$(DIR1)/scan.$(EXT1):	scan.man
 inst-send:	$(MANDIR)/$(DIR1)/send.$(EXT1)
 
 $(MANDIR)/$(DIR1)/send.$(EXT1):	send.man
-		-$(REMOVE) $@ zsend.man
-		cp send.man $@
+		$(CP) send.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -788,8 +735,7 @@ $(MANDIR)/$(DIR1)/send.$(EXT1):	send.man
 inst-show:	$(MANDIR)/$(DIR1)/show.$(EXT1)
 
 $(MANDIR)/$(DIR1)/show.$(EXT1):	show.man
-		-$(REMOVE) $@ zshow.man
-		cp show.man $@
+		$(CP) show.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -797,8 +743,7 @@ $(MANDIR)/$(DIR1)/show.$(EXT1):	show.man
 inst-slocal:	$(MANDIR)/$(DIR1)/slocal.$(EXT1)
 
 $(MANDIR)/$(DIR1)/slocal.$(EXT1):	slocal.man
-		-$(REMOVE) $@ zslocal.man
-		cp slocal.man $@
+		$(CP) slocal.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -806,8 +751,7 @@ $(MANDIR)/$(DIR1)/slocal.$(EXT1):	slocal
 inst-sortm:	$(MANDIR)/$(DIR1)/sortm.$(EXT1)
 
 $(MANDIR)/$(DIR1)/sortm.$(EXT1):	sortm.man
-		-$(REMOVE) $@ zsortm.man
-		cp sortm.man $@
+		$(CP) sortm.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -815,8 +759,7 @@ $(MANDIR)/$(DIR1)/sortm.$(EXT1):	sortm.m
 inst-tma:	$(MANDIR)/$(DIR1)/tma.$(EXT1)
 
 $(MANDIR)/$(DIR1)/tma.$(EXT1):	tma.man
-		-$(REMOVE) $@ ztma.man
-		cp tma.man $@
+		$(CP) tma.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -824,8 +767,7 @@ $(MANDIR)/$(DIR1)/tma.$(EXT1):	tma.man
 inst-vmh:	$(MANDIR)/$(DIR1)/vmh.$(EXT1)
 
 $(MANDIR)/$(DIR1)/vmh.$(EXT1):	vmh.man
-		-$(REMOVE) $@ zvmh.man
-		cp vmh.man $@
+		$(CP) vmh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -833,8 +775,7 @@ $(MANDIR)/$(DIR1)/vmh.$(EXT1):	vmh.man
 inst-whatnow:	$(MANDIR)/$(DIR1)/whatnow.$(EXT1)
 
 $(MANDIR)/$(DIR1)/whatnow.$(EXT1):	whatnow.man
-		-$(REMOVE) $@ zwhatnow.man
-		cp whatnow.man $@
+		$(CP) whatnow.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -842,8 +783,7 @@ $(MANDIR)/$(DIR1)/whatnow.$(EXT1):	whatn
 inst-whom:	$(MANDIR)/$(DIR1)/whom.$(EXT1)
 
 $(MANDIR)/$(DIR1)/whom.$(EXT1):	whom.man
-		-$(REMOVE) $@ zwhom.man
-		cp whom.man $@
+		$(CP) whom.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -852,8 +792,7 @@ $(MANDIR)/$(DIR1)/whom.$(EXT1):	whom.man
 inst-ja-ali:	$(JMANDIR)/$(DIR1)/ali.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/ali.$(EXT1):	ja-ali.man
-		-$(REMOVE) $@ zja-ali.man
-		cp ja-ali.man $@
+		$(CP) ja-ali.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -861,8 +800,7 @@ $(JMANDIR)/$(DIR1)/ali.$(EXT1):	ja-ali.m
 inst-ja-anno:	$(JMANDIR)/$(DIR1)/anno.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/anno.$(EXT1):	ja-anno.man
-		-$(REMOVE) $@ zja-anno.man
-		cp ja-anno.man $@
+		$(CP) ja-anno.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -870,8 +808,7 @@ $(JMANDIR)/$(DIR1)/anno.$(EXT1):	ja-anno
 inst-ja-ap:	$(JMANDIR)/$(DIR8)/ap.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/ap.$(EXT8):	ja-ap.man
-		-$(REMOVE) $@ zja-ap.man
-		cp ja-ap.man $@
+		$(CP) ja-ap.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -879,8 +816,7 @@ $(JMANDIR)/$(DIR8)/ap.$(EXT8):	ja-ap.man
 inst-ja-bbc:	$(JMANDIR)/$(DIR1)/bbc.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/bbc.$(EXT1):	ja-bbc.man
-		-$(REMOVE) $@ zja-bbc.man
-		cp ja-bbc.man $@
+		$(CP) ja-bbc.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -888,8 +824,7 @@ $(JMANDIR)/$(DIR1)/bbc.$(EXT1):	ja-bbc.m
 inst-ja-burst:	$(JMANDIR)/$(DIR1)/burst.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/burst.$(EXT1):	ja-burst.man
-		-$(REMOVE) $@ zja-burst.man
-		cp ja-burst.man $@
+		$(CP) ja-burst.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -897,8 +832,7 @@ $(JMANDIR)/$(DIR1)/burst.$(EXT1):	ja-bur
 inst-ja-comp:	$(JMANDIR)/$(DIR1)/comp.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/comp.$(EXT1):	ja-comp.man
-		-$(REMOVE) $@ zja-comp.man
-		cp ja-comp.man $@
+		$(CP) ja-comp.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -906,8 +840,7 @@ $(JMANDIR)/$(DIR1)/comp.$(EXT1):	ja-comp
 inst-ja-conflict:	$(JMANDIR)/$(DIR8)/conflict.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/conflict.$(EXT8):	ja-conflict.man
-		-$(REMOVE) $@ zja-conflict.man
-		cp ja-conflict.man $@
+		$(CP) ja-conflict.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -915,8 +848,7 @@ $(JMANDIR)/$(DIR8)/conflict.$(EXT8):	ja-
 inst-ja-dist:	$(JMANDIR)/$(DIR1)/dist.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/dist.$(EXT1):	ja-dist.man
-		-$(REMOVE) $@ zja-dist.man
-		cp ja-dist.man $@
+		$(CP) ja-dist.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -924,8 +856,7 @@ $(JMANDIR)/$(DIR1)/dist.$(EXT1):	ja-dist
 inst-ja-dp:	$(JMANDIR)/$(DIR8)/dp.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/dp.$(EXT8):	ja-dp.man
-		-$(REMOVE) $@ zja-dp.man
-		cp ja-dp.man $@
+		$(CP) ja-dp.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -933,8 +864,7 @@ $(JMANDIR)/$(DIR8)/dp.$(EXT8):	ja-dp.man
 inst-ja-fmtdump:	$(JMANDIR)/$(DIR8)/fmtdump.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/fmtdump.$(EXT8):	ja-fmtdump.man
-		-$(REMOVE) $@ zja-fmtdump.man
-		cp ja-fmtdump.man $@
+		$(CP) ja-fmtdump.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -942,8 +872,7 @@ $(JMANDIR)/$(DIR8)/fmtdump.$(EXT8):	ja-f
 inst-ja-folder:	$(JMANDIR)/$(DIR1)/folder.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/folder.$(EXT1):	ja-folder.man
-		-$(REMOVE) $@ zja-folder.man
-		cp ja-folder.man $@
+		$(CP) ja-folder.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -951,8 +880,7 @@ $(JMANDIR)/$(DIR1)/folder.$(EXT1):	ja-fo
 inst-ja-forw:	$(JMANDIR)/$(DIR1)/forw.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/forw.$(EXT1):	ja-forw.man
-		-$(REMOVE) $@ zja-forw.man
-		cp ja-forw.man $@
+		$(CP) ja-forw.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -960,8 +888,7 @@ $(JMANDIR)/$(DIR1)/forw.$(EXT1):	ja-forw
 inst-ja-inc:	$(JMANDIR)/$(DIR1)/inc.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/inc.$(EXT1):	ja-inc.man
-		-$(REMOVE) $@ zja-inc.man
-		cp ja-inc.man $@
+		$(CP) ja-inc.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -969,8 +896,7 @@ $(JMANDIR)/$(DIR1)/inc.$(EXT1):	ja-inc.m
 inst-ja-install-mh:	$(JMANDIR)/$(DIR8)/install-mh.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/install-mh.$(EXT8):	ja-install-mh.man
-		-$(REMOVE) $@ zja-install-mh.man
-		cp ja-install-mh.man $@
+		$(CP) ja-install-mh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -978,8 +904,7 @@ $(JMANDIR)/$(DIR8)/install-mh.$(EXT8):	j
 inst-ja-mark:	$(JMANDIR)/$(DIR1)/mark.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mark.$(EXT1):	ja-mark.man
-		-$(REMOVE) $@ zja-mark.man
-		cp ja-mark.man $@
+		$(CP) ja-mark.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -987,8 +912,7 @@ $(JMANDIR)/$(DIR1)/mark.$(EXT1):	ja-mark
 inst-ja-mh-alias:	$(JMANDIR)/$(DIR5)/mh-alias.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-alias.$(EXT5):	ja-mh-alias.man
-		-$(REMOVE) $@ zja-mh-alias.man
-		cp ja-mh-alias.man $@
+		$(CP) ja-mh-alias.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -996,8 +920,7 @@ $(JMANDIR)/$(DIR5)/mh-alias.$(EXT5):	ja-
 inst-ja-mh-chart:	$(JMANDIR)/$(DIR1)/mh-chart.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mh-chart.$(EXT1):	ja-mh-chart.man
-		-$(REMOVE) $@ zja-mh-chart.man
-		cp ja-mh-chart.man $@
+		$(CP) ja-mh-chart.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1005,8 +928,7 @@ $(JMANDIR)/$(DIR1)/mh-chart.$(EXT1):	ja-
 inst-ja-mh-format:	$(JMANDIR)/$(DIR5)/mh-format.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-format.$(EXT5):	ja-mh-format.man
-		-$(REMOVE) $@ zja-mh-format.man
-		cp ja-mh-format.man $@
+		$(CP) ja-mh-format.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1014,8 +936,7 @@ $(JMANDIR)/$(DIR5)/mh-format.$(EXT5):	ja
 inst-ja-mh-mail:	$(JMANDIR)/$(DIR5)/mh-mail.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-mail.$(EXT5):	ja-mh-mail.man
-		-$(REMOVE) $@ zja-mh-mail.man
-		cp ja-mh-mail.man $@
+		$(CP) ja-mh-mail.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1023,8 +944,7 @@ $(JMANDIR)/$(DIR5)/mh-mail.$(EXT5):	ja-m
 inst-ja-mh-profile:	$(JMANDIR)/$(DIR5)/mh-profile.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-profile.$(EXT5):	ja-mh-profile.man
-		-$(REMOVE) $@ zja-mh-profile.man
-		cp ja-mh-profile.man $@
+		$(CP) ja-mh-profile.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1032,8 +952,7 @@ $(JMANDIR)/$(DIR5)/mh-profile.$(EXT5):	j
 inst-ja-mh-sequence:	$(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5):	ja-mh-sequence.man
-		-$(REMOVE) $@ zja-mh-sequence.man
-		cp ja-mh-sequence.man $@
+		$(CP) ja-mh-sequence.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1041,8 +960,7 @@ $(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5):	
 inst-ja-mh-tailor:	$(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5)
 
 $(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5):	ja-mh-tailor.man
-		-$(REMOVE) $@ zja-mh-tailor.man
-		cp ja-mh-tailor.man $@
+		$(CP) ja-mh-tailor.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1050,8 +968,7 @@ $(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5):	ja
 inst-ja-mh:	$(JMANDIR)/$(DIR1)/mh.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mh.$(EXT1):	ja-mh.man
-		-$(REMOVE) $@ zja-mh.man
-		cp ja-mh.man $@
+		$(CP) ja-mh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1059,8 +976,7 @@ $(JMANDIR)/$(DIR1)/mh.$(EXT1):	ja-mh.man
 inst-ja-mhl:	$(JMANDIR)/$(DIR1)/mhl.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhl.$(EXT1):	ja-mhl.man
-		-$(REMOVE) $@ zja-mhl.man
-		cp ja-mhl.man $@
+		$(CP) ja-mhl.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1068,8 +984,7 @@ $(JMANDIR)/$(DIR1)/mhl.$(EXT1):	ja-mhl.m
 inst-ja-mhmail:	$(JMANDIR)/$(DIR1)/mhmail.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhmail.$(EXT1):	ja-mhmail.man
-		-$(REMOVE) $@ zja-mhmail.man
-		cp ja-mhmail.man $@
+		$(CP) ja-mhmail.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1077,8 +992,7 @@ $(JMANDIR)/$(DIR1)/mhmail.$(EXT1):	ja-mh
 inst-ja-mhn:	$(JMANDIR)/$(DIR1)/mhn.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhn.$(EXT1):	ja-mhn.man
-		-$(REMOVE) $@ zja-mhn.man
-		cp ja-mhn.man $@
+		$(CP) ja-mhn.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1086,8 +1000,7 @@ $(JMANDIR)/$(DIR1)/mhn.$(EXT1):	ja-mhn.m
 inst-ja-mhook:	$(JMANDIR)/$(DIR1)/mhook.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhook.$(EXT1):	ja-mhook.man
-		-$(REMOVE) $@ zja-mhook.man
-		cp ja-mhook.man $@
+		$(CP) ja-mhook.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1095,8 +1008,7 @@ $(JMANDIR)/$(DIR1)/mhook.$(EXT1):	ja-mho
 inst-ja-mhparam:	$(JMANDIR)/$(DIR1)/mhparam.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhparam.$(EXT1):	ja-mhparam.man
-		-$(REMOVE) $@ zja-mhparam.man
-		cp ja-mhparam.man $@
+		$(CP) ja-mhparam.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1104,8 +1016,7 @@ $(JMANDIR)/$(DIR1)/mhparam.$(EXT1):	ja-m
 inst-ja-mhpath:	$(JMANDIR)/$(DIR1)/mhpath.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/mhpath.$(EXT1):	ja-mhpath.man
-		-$(REMOVE) $@ zja-mhpath.man
-		cp ja-mhpath.man $@
+		$(CP) ja-mhpath.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1113,8 +1024,7 @@ $(JMANDIR)/$(DIR1)/mhpath.$(EXT1):	ja-mh
 inst-ja-msgchk:	$(JMANDIR)/$(DIR1)/msgchk.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/msgchk.$(EXT1):	ja-msgchk.man
-		-$(REMOVE) $@ zja-msgchk.man
-		cp ja-msgchk.man $@
+		$(CP) ja-msgchk.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1122,8 +1032,7 @@ $(JMANDIR)/$(DIR1)/msgchk.$(EXT1):	ja-ms
 inst-ja-msh:	$(JMANDIR)/$(DIR1)/msh.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/msh.$(EXT1):	ja-msh.man
-		-$(REMOVE) $@ zja-msh.man
-		cp ja-msh.man $@
+		$(CP) ja-msh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1131,8 +1040,7 @@ $(JMANDIR)/$(DIR1)/msh.$(EXT1):	ja-msh.m
 inst-ja-next:	$(JMANDIR)/$(DIR1)/next.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/next.$(EXT1):	ja-next.man
-		-$(REMOVE) $@ zja-next.man
-		cp ja-next.man $@
+		$(CP) ja-next.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1140,8 +1048,7 @@ $(JMANDIR)/$(DIR1)/next.$(EXT1):	ja-next
 inst-ja-packf:	$(JMANDIR)/$(DIR1)/packf.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/packf.$(EXT1):	ja-packf.man
-		-$(REMOVE) $@ zja-packf.man
-		cp ja-packf.man $@
+		$(CP) ja-packf.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1149,8 +1056,7 @@ $(JMANDIR)/$(DIR1)/packf.$(EXT1):	ja-pac
 inst-ja-pgped:	$(JMANDIR)/$(DIR1)/pgped.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/pgped.$(EXT1):	ja-pgped.man
-		-$(REMOVE) $@ zja-pgped.man
-		cp ja-pgped.man $@
+		$(CP) ja-pgped.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1158,8 +1064,7 @@ $(JMANDIR)/$(DIR1)/pgped.$(EXT1):	ja-pgp
 inst-ja-pick:	$(JMANDIR)/$(DIR1)/pick.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/pick.$(EXT1):	ja-pick.man
-		-$(REMOVE) $@ zja-pick.man
-		cp ja-pick.man $@
+		$(CP) ja-pick.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1167,8 +1072,7 @@ $(JMANDIR)/$(DIR1)/pick.$(EXT1):	ja-pick
 inst-ja-post:	$(JMANDIR)/$(DIR8)/post.$(EXT8)
 
 $(JMANDIR)/$(DIR8)/post.$(EXT8):	ja-post.man
-		-$(REMOVE) $@ zja-post.man
-		cp ja-post.man $@
+		$(CP) ja-post.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1176,8 +1080,7 @@ $(JMANDIR)/$(DIR8)/post.$(EXT8):	ja-post
 inst-ja-prev:	$(JMANDIR)/$(DIR1)/prev.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/prev.$(EXT1):	ja-prev.man
-		-$(REMOVE) $@ zja-prev.man
-		cp ja-prev.man $@
+		$(CP) ja-prev.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1185,8 +1088,7 @@ $(JMANDIR)/$(DIR1)/prev.$(EXT1):	ja-prev
 inst-ja-prompter:	$(JMANDIR)/$(DIR1)/prompter.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/prompter.$(EXT1):	ja-prompter.man
-		-$(REMOVE) $@ zja-prompter.man
-		cp ja-prompter.man $@
+		$(CP) ja-prompter.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1194,8 +1096,7 @@ $(JMANDIR)/$(DIR1)/prompter.$(EXT1):	ja-
 inst-ja-rcvstore:	$(JMANDIR)/$(DIR1)/rcvstore.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/rcvstore.$(EXT1):	ja-rcvstore.man
-		-$(REMOVE) $@ zja-rcvstore.man
-		cp ja-rcvstore.man $@
+		$(CP) ja-rcvstore.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1203,8 +1104,7 @@ $(JMANDIR)/$(DIR1)/rcvstore.$(EXT1):	ja-
 inst-ja-refile:	$(JMANDIR)/$(DIR1)/refile.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/refile.$(EXT1):	ja-refile.man
-		-$(REMOVE) $@ zja-refile.man
-		cp ja-refile.man $@
+		$(CP) ja-refile.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1212,8 +1112,7 @@ $(JMANDIR)/$(DIR1)/refile.$(EXT1):	ja-re
 inst-ja-repl:	$(JMANDIR)/$(DIR1)/repl.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/repl.$(EXT1):	ja-repl.man
-		-$(REMOVE) $@ zja-repl.man
-		cp ja-repl.man $@
+		$(CP) ja-repl.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1221,8 +1120,7 @@ $(JMANDIR)/$(DIR1)/repl.$(EXT1):	ja-repl
 inst-ja-rmf:	$(JMANDIR)/$(DIR1)/rmf.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/rmf.$(EXT1):	ja-rmf.man
-		-$(REMOVE) $@ zja-rmf.man
-		cp ja-rmf.man $@
+		$(CP) ja-rmf.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1230,8 +1128,7 @@ $(JMANDIR)/$(DIR1)/rmf.$(EXT1):	ja-rmf.m
 inst-ja-rmm:	$(JMANDIR)/$(DIR1)/rmm.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/rmm.$(EXT1):	ja-rmm.man
-		-$(REMOVE) $@ zja-rmm.man
-		cp ja-rmm.man $@
+		$(CP) ja-rmm.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1239,8 +1136,7 @@ $(JMANDIR)/$(DIR1)/rmm.$(EXT1):	ja-rmm.m
 inst-ja-scan:	$(JMANDIR)/$(DIR1)/scan.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/scan.$(EXT1):	ja-scan.man
-		-$(REMOVE) $@ zja-scan.man
-		cp ja-scan.man $@
+		$(CP) ja-scan.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1248,8 +1144,7 @@ $(JMANDIR)/$(DIR1)/scan.$(EXT1):	ja-scan
 inst-ja-send:	$(JMANDIR)/$(DIR1)/send.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/send.$(EXT1):	ja-send.man
-		-$(REMOVE) $@ zja-send.man
-		cp ja-send.man $@
+		$(CP) ja-send.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1257,8 +1152,7 @@ $(JMANDIR)/$(DIR1)/send.$(EXT1):	ja-send
 inst-ja-show:	$(JMANDIR)/$(DIR1)/show.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/show.$(EXT1):	ja-show.man
-		-$(REMOVE) $@ zja-show.man
-		cp ja-show.man $@
+		$(CP) ja-show.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1266,8 +1160,7 @@ $(JMANDIR)/$(DIR1)/show.$(EXT1):	ja-show
 inst-ja-slocal:	$(JMANDIR)/$(DIR1)/slocal.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/slocal.$(EXT1):	ja-slocal.man
-		-$(REMOVE) $@ zja-slocal.man
-		cp ja-slocal.man $@
+		$(CP) ja-slocal.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1275,8 +1168,7 @@ $(JMANDIR)/$(DIR1)/slocal.$(EXT1):	ja-sl
 inst-ja-sortm:	$(JMANDIR)/$(DIR1)/sortm.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/sortm.$(EXT1):	ja-sortm.man
-		-$(REMOVE) $@ zja-sortm.man
-		cp ja-sortm.man $@
+		$(CP) ja-sortm.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1284,8 +1176,7 @@ $(JMANDIR)/$(DIR1)/sortm.$(EXT1):	ja-sor
 inst-ja-vmh:	$(JMANDIR)/$(DIR1)/vmh.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/vmh.$(EXT1):	ja-vmh.man
-		-$(REMOVE) $@ zja-vmh.man
-		cp ja-vmh.man $@
+		$(CP) ja-vmh.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1293,8 +1184,7 @@ $(JMANDIR)/$(DIR1)/vmh.$(EXT1):	ja-vmh.m
 inst-ja-whatnow:	$(JMANDIR)/$(DIR1)/whatnow.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/whatnow.$(EXT1):	ja-whatnow.man
-		-$(REMOVE) $@ zja-whatnow.man
-		cp ja-whatnow.man $@
+		$(CP) ja-whatnow.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1302,8 +1192,7 @@ $(JMANDIR)/$(DIR1)/whatnow.$(EXT1):	ja-w
 inst-ja-whom:	$(JMANDIR)/$(DIR1)/whom.$(EXT1)
 
 $(JMANDIR)/$(DIR1)/whom.$(EXT1):	ja-whom.man
-		-$(REMOVE) $@ zja-whom.man
-		cp ja-whom.man $@
+		$(CP) ja-whom.man $@
 		-@chmod $(MANPROT) $@
 		-@ls -l $@
 		-@echo ""
@@ -1505,8 +1394,7 @@ depend:;
 #	inst-pickle:	$(MANDIR)/$(DIR[n])/pickle.$(EXT[n])
 #	
 #	$(MANDIR)/$(DIR[n])/pickle.$(EXT[n]):	pickle.man
-#			-$(REMOVE) $@ zpickle.man
-#			cp pickle.man $@
+#			$(CP) pickle.man $@
 #			-@chmod $(MANPROT) $@
 #			-@ls -l $@
 #			-@echo ""