From 4e99d889ff5c0437873ba54432465559bc3b022a Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 5 Nov 1991 15:31:14 +0000
Subject: [PATCH] Changed manual page installation mechanism

---
 fast/driver/proto.make           |  7 +++----
 lang/cem/cemcom.ansi/ival.g      |  8 ++++----
 lang/cem/cemcom.ansi/proto.make  |  5 +++--
 lang/cem/cemcom/ival.g           | 10 +++++-----
 lang/cem/cemcom/proto.make       |  5 +++--
 lang/cem/cpp.ansi/proto.make     |  5 +++--
 lang/cem/lint/lpass2/proto.make  |  3 +--
 lang/fortran/comp/proto.make     |  5 ++---
 lang/m2/comp/proto.make          |  6 ++----
 lang/m2/m2mm/proto.make          |  3 +--
 mach/mantra/int/proto.make       |  3 +--
 mach/pdp/int/proto.make          |  5 ++---
 man/head                         |  7 +++----
 man/proto.make                   |  7 ++-----
 modules/src/alloc/proto.make     |  5 ++++-
 modules/src/assert/proto.make    |  5 ++++-
 modules/src/em_code/proto.make   |  7 +++++--
 modules/src/em_mes/proto.make    |  3 +++
 modules/src/em_opt/proto.make    |  6 +++---
 modules/src/flt_arith/proto.make |  3 +++
 modules/src/idf/proto.make       |  3 +++
 modules/src/input/proto.make     |  5 ++++-
 modules/src/object/proto.make    |  3 +++
 modules/src/print/proto.make     |  3 +++
 modules/src/read_em/proto.make   |  5 ++++-
 modules/src/string/proto.make    |  3 +++
 modules/src/system/proto.make    |  3 +++
 util/LLgen/proto.make            |  6 ++----
 util/ack/proto.make              |  6 ++----
 util/amisc/proto.make            |  4 +---
 util/arch/proto.make             |  8 +++-----
 util/ass/proto.make              |  3 +--
 util/byacc/proto.make            |  6 +++---
 util/cmisc/proto.make            | 10 ++++------
 util/cpp/proto.make              |  4 +---
 util/flex/proto.make             | 26 +++++++++++++++++---------
 util/grind/proto.make            |  3 +--
 util/int/proto.make              |  3 +--
 util/led/proto.make              |  6 ++----
 util/misc/proto.make             |  6 ++----
 util/ncgg/proto.make             |  4 +---
 util/opt/proto.make              |  3 +--
 42 files changed, 122 insertions(+), 109 deletions(-)

diff --git a/fast/driver/proto.make b/fast/driver/proto.make
index 1a0c0339b..a3626cf6c 100644
--- a/fast/driver/proto.make
+++ b/fast/driver/proto.make
@@ -13,16 +13,15 @@ all:	afcc afm2 afpc
 install:	all
 	cp afcc afm2 afpc $(TARGET_HOME)/bin
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	cp $(SRC_DIR)/afcc.1 $(SRC_DIR)/afm2.1 $(SRC_DIR)/afpc.1 $(TARGET_HOME)/man ; \
+	then	mk_manpage $(SRC_DIR)/afcc.1 $(TARGET_HOME) ; \
+		mk_manpage $(SRC_DIR)/afpc.1 $(TARGET_HOME) ; \
+		mk_manpage $(SRC_DIR)/afm2.1 $(TARGET_HOME) ; \
 	fi
 
 cmp:	all
 	-cmp afcc $(TARGET_HOME)/bin/afcc
 	-cmp afm2 $(TARGET_HOME)/bin/afm2
 	-cmp afpc $(TARGET_HOME)/bin/afpc
-	-cmp afcc.1 $(TARGET_HOME)/man/afcc.1
-	-cmp afm2.1 $(TARGET_HOME)/man/afm2.1
-	-cmp afpc.1 $(TARGET_HOME)/man/afpc.1
 
 pr:
 	@pr $(SRC_DIR)/proto.make $(SRC_DIR)/driver.c
diff --git a/lang/cem/cemcom.ansi/ival.g b/lang/cem/cemcom.ansi/ival.g
index 196d83c9c..c944bea89 100644
--- a/lang/cem/cemcom.ansi/ival.g
+++ b/lang/cem/cemcom.ansi/ival.g
@@ -72,7 +72,7 @@ initial_value(register struct type **tpp; register struct expr **expp;) :
 					free_expression(*expp);
 					*expp = 0;
 				} else {
-					expr_error(*expp,"illegal initialisation");
+					expr_error(*expp,"illegal initialization");
 					free_expression(*expp);
 					*expp = 0;
 				}
@@ -602,7 +602,7 @@ ch_array(tpp, ex)
 		} else
 #endif
 		if (length > dim + 1) {
-			expr_strict(ex, "too many initialisers");
+			expr_strict(ex, "too many initializers");
 		}
 		length = dim;
 	}
@@ -725,13 +725,13 @@ con_int(ex)
 illegal_init_cst(ex)
 	struct expr *ex;
 {
-	expr_error(ex, "illegal initialisation constant");
+	expr_error(ex, "illegal initialization constant");
 	gen_error = pack_level;
 }
 
 too_many_initialisers()
 {
-	error("too many initialisers");
+	error("too many initializers");
 	gen_error = pack_level;
 }
 }
diff --git a/lang/cem/cemcom.ansi/proto.make b/lang/cem/cemcom.ansi/proto.make
index f7d14a493..aa01915e1 100644
--- a/lang/cem/cemcom.ansi/proto.make
+++ b/lang/cem/cemcom.ansi/proto.make
@@ -131,12 +131,13 @@ install:	all
 		@-mkdir $(TARGET_HOME)/lib.bin
 		cp main $(TARGET_HOME)/lib.bin/em_cemcom.ansi
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/cemcom.ansi.1 $(TARGET_HOME)/man/cemcom.ansi.6 ; \
+		then	cp $(SRC_DIR)/cemcom.ansi.1 cemcom.ansi.6 ; \
+			mk_manpage cemcom.ansi.6 $(TARGET_HOME) ; \
+			rm -f cemcom.ansi.6 ; \
 		fi
 
 cmp:		all
 		-cmp main $(TARGET_HOME)/lib.bin/em_cemcom.ansi
-		-cmp $(SRC_DIR)/cemcom.ansi.1 $(TARGET_HOME)/man/cemcom.ansi.6
 
 opr:
 		make pr | opr
diff --git a/lang/cem/cemcom/ival.g b/lang/cem/cemcom/ival.g
index ff67b0f6d..e1964f5a1 100644
--- a/lang/cem/cemcom/ival.g
+++ b/lang/cem/cemcom/ival.g
@@ -128,7 +128,7 @@ gen_tpcheck(tpp, union_allowed)
 		break;
 	case UNION:
 		if (! union_allowed) {
-			error("union initialisation not allowed");
+			error("union initialization not allowed");
 			gen_error = pack_level;
 			break;
 		}
@@ -432,7 +432,7 @@ pad(tpx)
 	case UNION:
 #ifndef NOROPTION
 		if (options['R']) {
-			warning("initialisation of unions not allowed");
+			warning("initialization of unions not allowed");
 		}
 #endif
 		break;
@@ -583,7 +583,7 @@ ch_array(tpp, ex)
 		arith dim = tp->tp_size / tp->tp_up->tp_size;
 
 		if (length > dim) {
-			expr_warning(ex, "too many initialisers");
+			expr_warning(ex, "too many initializers");
 		}
 		length = dim;
 	}
@@ -700,13 +700,13 @@ con_int(ex)
 illegal_init_cst(ex)
 	struct expr *ex;
 {
-	expr_error(ex, "illegal initialisation constant");
+	expr_error(ex, "illegal initialization constant");
 	gen_error = pack_level;
 }
 
 too_many_initialisers()
 {
-	error("too many initialisers");
+	error("too many initializers");
 	gen_error = pack_level;
 }
 }
diff --git a/lang/cem/cemcom/proto.make b/lang/cem/cemcom/proto.make
index 9ff9e1ab5..340f4a054 100644
--- a/lang/cem/cemcom/proto.make
+++ b/lang/cem/cemcom/proto.make
@@ -126,12 +126,13 @@ all:		make.main
 install:	all
 		cp main $(TARGET_HOME)/lib.bin/em_cemcom
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/cemcom.1 $(TARGET_HOME)/man/em_cemcom.6 ; \
+		then	cp $(SRC_DIR)/cemcom.1 em_cemcom.6 ; \
+			mk_manpage em_cemcom.6 $(TARGET_HOME) ; \
+			rm -f em_cemcom.6 ; \
 		fi
 
 cmp:		all
 		-cmp main $(TARGET_HOME)/lib.bin/em_cemcom
-		-cmp $(SRC_DIR)/cemcom.1 $(TARGET_HOME)/man/em_cemcom.6
 
 opr:
 		make pr | opr
diff --git a/lang/cem/cpp.ansi/proto.make b/lang/cem/cpp.ansi/proto.make
index dd21eefcb..015e3396a 100644
--- a/lang/cem/cpp.ansi/proto.make
+++ b/lang/cem/cpp.ansi/proto.make
@@ -65,12 +65,13 @@ all:		make.main
 install:	all
 		cp main $(TARGET_HOME)/lib.bin/cpp.ansi
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/ncpp.6 $(TARGET_HOME)/man/cpp.ansi.6 ; \
+		then	cp $(SRC_DIR)/ncpp.6 cpp.ansi.6 ; \
+			mk_manpage cpp.ansi.6 $(TARGET_HOME) ; \
+			rm -f cpp.ansi.6 ; \
 		fi
 
 cmp:		all
 		-cmp main $(TARGET_HOME)/lib.bin/cpp.ansi
-		-cmp $(SRC_DIR)/ncpp.6 $(TARGET_HOME)/man/cpp.ansi.6
 
 opr:
 		make pr | opr
diff --git a/lang/cem/lint/lpass2/proto.make b/lang/cem/lint/lpass2/proto.make
index 5a9120480..fb089f1d5 100644
--- a/lang/cem/lint/lpass2/proto.make
+++ b/lang/cem/lint/lpass2/proto.make
@@ -37,13 +37,12 @@ install:	all
 	cp lpass2 $(TARGET_HOME)/lib.bin/lint/lpass2
 	cp lint.exec $(TARGET_HOME)/bin/lint
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then cp $(SRC_DIR)/lint.1 $(TARGET_HOME)/man/lint.1 ; \
+	then	mk_manpage $(SRC_DIR)/lint.1 $(TARGET_HOME) ; \
 	fi
 
 cmp:	all
 	-cmp lpass2 $(TARGET_HOME)/lib.bin/lint/lpass2
 	-cmp lint.exec $(TARGET_HOME)/bin/lint
-	-cmp $(SRC_DIR)/lint.1 $(TARGET_HOME)/man/lint.1
 
 pr:
 	@pr $(SRC_DIR)/proto.make $(SRC_DIR)/inpdef.str $(SRC_DIR)/class.h \
diff --git a/lang/fortran/comp/proto.make b/lang/fortran/comp/proto.make
index 0a21b8a4f..eb93cee12 100644
--- a/lang/fortran/comp/proto.make
+++ b/lang/fortran/comp/proto.make
@@ -81,13 +81,12 @@ all:	f2c
 install:	all
 	cp f2c $(TARGET_HOME)/lib.bin/f2c
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then cp $(SRC_DIR)/f2c.6 $(TARGET_HOME)/man/f2c.6 ; \
-	     cp $(SRC_DIR)/f2c.h $(TARGET_HOME)/include/_tail_cc/f2c.h ; \
+	then	mk_manpage $(SRC_DIR)/f2c.6 $(TARGET_HOME) ; \
+	     	cp $(SRC_DIR)/f2c.h $(TARGET_HOME)/include/_tail_cc/f2c.h ; \
 	fi
 
 cmp:	all
 	-cmp f2c $(TARGET_HOME)/lib.bin/f2c
-	-cmp $(SRC_DIR)/f2c.6 $(TARGET_HOME)/man/f2c.6
 	-cmp $(SRC_DIR)/f2c.h $(TARGET_HOME)/include/_tail_cc/f2c.h
 
 lint:	$(CFILES) tokdefs.h
diff --git a/lang/m2/comp/proto.make b/lang/m2/comp/proto.make
index f6300d23f..688390810 100644
--- a/lang/m2/comp/proto.make
+++ b/lang/m2/comp/proto.make
@@ -52,15 +52,13 @@ all:		make.main
 
 install:	all
 		cp main $(TARGET_HOME)/lib.bin/em_m2
-		@-mkdir $(TARGET_HOME)/man
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/em_m2.6 $(SRC_DIR)/modula-2.1 $(TARGET_HOME)/man ; \
+		then	mk_manpage $(SRC_DIR)/em_m2.6 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/modula-2.1 $(TARGET_HOME) ; \
 		fi
 
 cmp:		all
 		-cmp main $(TARGET_HOME)/lib.bin/em_m2
-		-cmp $(SRC_DIR)/em_m2.6 $(TARGET_HOME)/man/em_m2.6
-		-cmp $(SRC_DIR)/modula-2.1 $(TARGET_HOME)/man/modula-2.1
 
 opr:
 		make pr | opr
diff --git a/lang/m2/m2mm/proto.make b/lang/m2/m2mm/proto.make
index a315bd5da..e3f980489 100644
--- a/lang/m2/m2mm/proto.make
+++ b/lang/m2/m2mm/proto.make
@@ -40,12 +40,11 @@ all:		make.main
 install:	all
 		cp main $(TARGET_HOME)/bin/m2mm
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/m2mm.1 $(TARGET_HOME)/man/m2mm.1 ; \
+		then	mk_manpage $(SRC_DIR)/m2mm.1 $(TARGET_HOME) ; \
 		fi
 
 cmp:		all
 		-cmp main $(TARGET_HOME)/lib.bin/em_m2
-		-cmp $(SRC_DIR)/m2mm.1 $(TARGET_HOME)/man/m2mm.1
 
 opr:
 		make pr | opr
diff --git a/mach/mantra/int/proto.make b/mach/mantra/int/proto.make
index 55a4d941b..1349ba963 100644
--- a/mach/mantra/int/proto.make
+++ b/mach/mantra/int/proto.make
@@ -68,14 +68,13 @@ install:	all
 		ls em4_???? | sed 's:em4_\(.*\):cp & $b44/em_\1:' | sh
 		cp em $(TARGET_HOME)/bin/em
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp em.1 $(TARGET_HOME)/man/em.1 ; \
+		then	mk_manpage $(SRC_DIR)/em.1 $(TARGET_HOME) ; \
 		fi
 
 cmp: 		all
 		-ls em2_???? | sed 's:em2_\(.*\):cmp & $b24/em_\1:' | sh
 		-ls em4_???? | sed 's:em4_\(.*\):cmp & $b44/em_\1:' | sh
 		-cmp em $(TARGET_HOME)/bin/em
-		-cmp em.1 $(TARGET_HOME)/man/em.1
 
 clean:
 		-rm -f *.o *.old a.out em tmp.s $(INTS) compile
diff --git a/mach/pdp/int/proto.make b/mach/pdp/int/proto.make
index 11a1d35f4..66fe71e84 100644
--- a/mach/pdp/int/proto.make
+++ b/mach/pdp/int/proto.make
@@ -41,7 +41,8 @@ install:	all
 		cp em_???? $b
 		cp em eminform $(TARGET_HOME)/bin
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/em.1 $(SRC_DIR)/eminform.1 $(TARGET_HOME)/man ; \
+		then	mk_manpage $(SRC_DIR)/em.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/eminform.1 $(TARGET_HOME) ; \
 		fi
 
 cmp: 		all
@@ -52,8 +53,6 @@ cmp: 		all
 		-cmp em_t--p $b/em_t--p
 		-cmp em $(TARGET_HOME)/bin/em
 		-cmp eminform $(TARGET_HOME)/bin/eminform
-		-cmp $(SRC_DIR)/em.1 $(TARGET_HOME)/man/em.1
-		-cmp $(SRC_DIR)/eminform.1 $(TARGET_HOME)/man/eminform.1
 
 clean:
 		-rm -f *.o *.old a.out em eminform $(INTS)
diff --git a/man/head b/man/head
index e3d146886..bcea6351d 100644
--- a/man/head
+++ b/man/head
@@ -1,11 +1,10 @@
-.de TH
 .rn TH yy
+.de TH
 .di zz
-.so /usr/lib/tmac/tmac.an
-.TH "\\$1" "\\$2" "\\$3" "\\$4"
+.yy "\\$1" "\\$2" "\\$3" "\\$4"
 .ds ]W 5th ACK distribution
 .ds ]D Amsterdam Compiler Kit
+.ds ]L "\\$3
 .di
-.rm yy
 .rm zz
 ..
diff --git a/man/proto.make b/man/proto.make
index 3449a2638..20e703631 100644
--- a/man/proto.make
+++ b/man/proto.make
@@ -10,12 +10,9 @@ install:
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
 	then	if [ ! -d $(MANDIR) ] ; then mkdir $(MANDIR) ; fi ; \
 		cd $(SRC_HOME)/man ; \
+		cp head $(MANDIR)/head ; \
 		for i in *.[1-8] ; do \
-			num=`expr $$i : '.*\.\([1-8]\)'` ; \
-			if [ ! -d $(MANDIR)/man$$num ] ; \
-			then	mkdir $(MANDIR)/man$$num ; \
-			fi ; \
-			cat head $$i > $(MANDIR)/man$$num/$$i ; \
+			mk_manpage $$i $(TARGET_HOME) ; \
 		done ; \
 	fi
 
diff --git a/modules/src/alloc/proto.make b/modules/src/alloc/proto.make
index da3b06d74..7e1605a05 100644
--- a/modules/src/alloc/proto.make
+++ b/modules/src/alloc/proto.make
@@ -38,11 +38,14 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/$(LIBALLOC)
 		cp $(SRC_DIR)/alloc.3 $(MOD_DIR)/man/alloc.3
 		cp $(SRC_DIR)/alloc.h $(MOD_DIR)/h/alloc.h
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/alloc.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(LIBALLOC) $(MOD_DIR)/lib/$(LIBALLOC)
-		-cmp $(SRC_DIR)/alloc.3 $(MOD_DIR)/man/alloc.3
 		-cmp $(SRC_DIR)/alloc.h $(MOD_DIR)/h/alloc.h
+		-cmp $(SRC_DIR)/alloc.3 $(MOD_DIR)/man/alloc.3
 
 pr:
 		@pr $(SRC_DIR)/proto.make $(SOURCES)
diff --git a/modules/src/assert/proto.make b/modules/src/assert/proto.make
index 60824d09b..16504c261 100644
--- a/modules/src/assert/proto.make
+++ b/modules/src/assert/proto.make
@@ -18,11 +18,14 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/libassert.$(LIBSUF)
 		cp $(SRC_DIR)/assert.3 $(MOD_DIR)/man/assert.3
 		cp $(SRC_DIR)/assert.h $(MOD_DIR)/h/assert.h
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/assert.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp libassert.$(LIBSUF) $(MOD_DIR)/lib/libassert.$(LIBSUF)
-		-cmp $(SRC_DIR)/assert.3 $(MOD_DIR)/man/assert.3
 		-cmp $(SRC_DIR)/assert.h $(MOD_DIR)/h/assert.h
+		-cmp $(SRC_DIR)/assert.3 $(MOD_DIR)/man/assert.3
 
 pr:
 		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/assert.h $(SRC_DIR)/BadAssert.c
diff --git a/modules/src/em_code/proto.make b/modules/src/em_code/proto.make
index 3d09f3325..3a156ff10 100644
--- a/modules/src/em_code/proto.make
+++ b/modules/src/em_code/proto.make
@@ -70,12 +70,15 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/libemk.$(LIBSUF)
 		cp em_code.3 $(MOD_DIR)/man/em_code.3
 		cp em_codeEK.h $(MOD_DIR)/h/em_codeEK.h
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage em_code.3 $(TARGET_HOME) ; \
+		fi
 
-compare:	all
+cmp:	all
 		-cmp libeme.$(LIBSUF) $(MOD_DIR)/lib/libeme.$(LIBSUF)
 		-cmp libemk.$(LIBSUF) $(MOD_DIR)/lib/libemk.$(LIBSUF)
-		-cmp em_code.3 $(MOD_DIR)/man/em_code.3
 		-cmp em_codeEK.h $(MOD_DIR)/h/em_codeEK.h
+		-cmp em_code.3 $(MOD_DIR)/man/em_code.3
 
 em_code.3:	$(SRC_DIR)/em_code.3X
 		-sh -c 'tbl < $(SRC_DIR)/em_code.3X > em_code.3'
diff --git a/modules/src/em_mes/proto.make b/modules/src/em_mes/proto.make
index d5a5af135..1266e828f 100644
--- a/modules/src/em_mes/proto.make
+++ b/modules/src/em_mes/proto.make
@@ -52,6 +52,9 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/libem_mesCE.$(LIBSUF)
 		$(RANLIB) $(MOD_DIR)/lib/libem_mesO.$(LIBSUF)
 		cp $(SRC_DIR)/em_mes.3 $(MOD_DIR)/man/em_mes.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/em_mes.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp libem_mes.$(LIBSUF) $(MOD_DIR)/lib/libem_mes.$(LIBSUF)
diff --git a/modules/src/em_opt/proto.make b/modules/src/em_opt/proto.make
index d20ab3108..ac6643eaa 100644
--- a/modules/src/em_opt/proto.make
+++ b/modules/src/em_opt/proto.make
@@ -67,15 +67,15 @@ install:	all
 		cp $(SRC_DIR)/em_opt.3 $(MOD_DIR)/man/em_opt.3
 		cp em_nopt $(TARGET_HOME)/lib.bin/em_nopt
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/em_nopt.6 $(TARGET_HOME)/man/em_nopt.6 ; \
+		then	mk_manpage $(SRC_DIR)/em_opt.3 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/em_nopt.6 $(TARGET_HOME) ; \
 		fi
 
 cmp:		all
 		-cmp $(LIBOPT) $(MOD_DIR)/lib/$(LIBOPT)
 		-cmp $(LIBCEOPT) $(MOD_DIR)/lib/$(LIBCEOPT)
-		-cmp $(SRC_DIR)/em_opt.3 $(MOD_DIR)/man/em_opt.3
-		-cmp $(SRC_DIR)/em_nopt.6 $(TARGET_HOME)/man/em_nopt.6
 		-cmp em_nopt $(TARGET_HOME)/lib.bin/em_nopt
+		-cmp $(SRC_DIR)/em_opt.3 $(MOD_DIR)/man/em_opt.3
 
 pr:
 		@pr $(SRCS)
diff --git a/modules/src/flt_arith/proto.make b/modules/src/flt_arith/proto.make
index a93732c98..910981224 100644
--- a/modules/src/flt_arith/proto.make
+++ b/modules/src/flt_arith/proto.make
@@ -47,6 +47,9 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/$(LIBFLT)
 		cp $(SRC_DIR)/flt_arith.h $(MOD_DIR)/h/flt_arith.h
 		cp $(SRC_DIR)/flt_arith.3 $(MOD_DIR)/man/flt_arith.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/flt_arith.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(LIBFLT) $(MOD_DIR)/lib/$(LIBFLT)
diff --git a/modules/src/idf/proto.make b/modules/src/idf/proto.make
index 0e10ebddb..a3035664f 100644
--- a/modules/src/idf/proto.make
+++ b/modules/src/idf/proto.make
@@ -11,6 +11,9 @@ install:	all
 		cp $(SRC_DIR)/idf_pkg.body $(MOD_DIR)/pkg/idf_pkg.body
 		cp $(SRC_DIR)/idf_pkg.spec $(MOD_DIR)/pkg/idf_pkg.spec
 		cp $(SRC_DIR)/idf.3 $(MOD_DIR)/man/idf.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/idf.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(SRC_DIR)/idf_pkg.body $(MOD_DIR)/pkg/idf_pkg.body
diff --git a/modules/src/input/proto.make b/modules/src/input/proto.make
index 611e7c80f..15c9bc0b8 100644
--- a/modules/src/input/proto.make
+++ b/modules/src/input/proto.make
@@ -23,12 +23,15 @@ install:	all
 		cp $(SRC_DIR)/input.3 $(MOD_DIR)/man/input.3
 		cp $(SRC_DIR)/inp_pkg.body $(MOD_DIR)/pkg/inp_pkg.body
 		cp $(SRC_DIR)/inp_pkg.spec $(MOD_DIR)/pkg/inp_pkg.spec
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/input.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp libinput.$(LIBSUF) $(MOD_DIR)/lib/libinput.$(LIBSUF)
-		-cmp $(SRC_DIR)/input.3 $(MOD_DIR)/man/input.3
 		-cmp $(SRC_DIR)/inp_pkg.body $(MOD_DIR)/pkg/inp_pkg.body
 		-cmp $(SRC_DIR)/inp_pkg.spec $(MOD_DIR)/pkg/inp_pkg.spec
+		-cmp $(SRC_DIR)/input.3 $(MOD_DIR)/man/input.3
 
 pr:
 		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/inp_pkg.spec $(SRC_DIR)/inp_pkg.body $(SRC_DIR)/AtEoIF.c $(SRC_DIR)/AtEoIT.c
diff --git a/modules/src/object/proto.make b/modules/src/object/proto.make
index 148aa2256..d5a1cd820 100644
--- a/modules/src/object/proto.make
+++ b/modules/src/object/proto.make
@@ -25,6 +25,9 @@ install:	all
 		cp libobject.$(LIBSUF) $(MOD_DIR)/lib/libobject.$(LIBSUF)
 		$(RANLIB) $(MOD_DIR)/lib/libobject.$(LIBSUF)
 		cp $(SRC_DIR)/object.3 $(MOD_DIR)/man/object.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/object.3 $(TARGET_HOME) ; \
+		fi
 
 compare:	all
 		-cmp libobject.$(LIBSUF) $(MOD_DIR)/lib/libobject.$(LIBSUF)
diff --git a/modules/src/print/proto.make b/modules/src/print/proto.make
index 9fabe7b36..ad71aa0bb 100644
--- a/modules/src/print/proto.make
+++ b/modules/src/print/proto.make
@@ -24,6 +24,9 @@ install:	all
 		cp $(LIBPRINT) $(MOD_DIR)/lib/$(LIBPRINT)
 		$(RANLIB) $(MOD_DIR)/lib/$(LIBPRINT)
 		cp $(SRC_DIR)/print.3 $(MOD_DIR)/man/print.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/print.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(LIBPRINT) $(MOD_DIR)/lib/$(LIBPRINT)
diff --git a/modules/src/read_em/proto.make b/modules/src/read_em/proto.make
index f5483a423..b10e3d49b 100644
--- a/modules/src/read_em/proto.make
+++ b/modules/src/read_em/proto.make
@@ -43,13 +43,16 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/libread_emkV.$(LIBSUF)
 		cp libread_emeV.$(LIBSUF) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
 		$(RANLIB) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/read_em.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(SRC_DIR)/em_comp.h $(MOD_DIR)/h/em_comp.h
-		-cmp $(SRC_DIR)/read_em.3 $(MOD_DIR)/man/read_em.3
 		-cmp libread_emk.$(LIBSUF) $(MOD_DIR)/lib/libread_emk.$(LIBSUF)
 		-cmp libread_emkV.$(LIBSUF) $(MOD_DIR)/lib/libread_emkV.$(LIBSUF)
 		-cmp libread_emeV.$(LIBSUF) $(MOD_DIR)/lib/libread_emeV.$(LIBSUF)
+		-cmp $(SRC_DIR)/read_em.3 $(MOD_DIR)/man/read_em.3
 
 pr:
 		@pr $(SRC_DIR)/proto.make $(SRC_DIR)/m_C_mnem $(SRC_DIR)/m_C_mnem_na $(SRC_DIR)/argtype $(SRCFILES)
diff --git a/modules/src/string/proto.make b/modules/src/string/proto.make
index fb843f957..4fd502139 100644
--- a/modules/src/string/proto.make
+++ b/modules/src/string/proto.make
@@ -33,6 +33,9 @@ install:	all
 		cp $(LIBSTRING) $(MOD_DIR)/lib/$(LIBSTRING)
 		$(RANLIB) $(MOD_DIR)/lib/$(LIBSTRING)
 		cp $(SRC_DIR)/string.3 $(MOD_DIR)/man/string.3
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/string.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(LIBSTRING) $(MOD_DIR)/lib/$(LIBSTRING)
diff --git a/modules/src/system/proto.make b/modules/src/system/proto.make
index 4cf6cd4c5..3fbc4644f 100644
--- a/modules/src/system/proto.make
+++ b/modules/src/system/proto.make
@@ -33,6 +33,9 @@ install:	all
 		$(RANLIB) $(MOD_DIR)/lib/$(LIBSYS)
 		cp $(SRC_DIR)/system.3 $(MOD_DIR)/man/system.3
 		cp $(SRC_DIR)/system.h $(MOD_DIR)/h/system.h
+		if [ $(DO_MACHINE_INDEP) = y ] ; \
+		then	mk_manpage $(SRC_DIR)/system.3 $(TARGET_HOME) ; \
+		fi
 
 cmp:		all
 		-cmp $(LIBSYS) $(MOD_DIR)/lib/$(LIBSYS)
diff --git a/util/LLgen/proto.make b/util/LLgen/proto.make
index 1ae13b278..f46f5d0b3 100644
--- a/util/LLgen/proto.make
+++ b/util/LLgen/proto.make
@@ -4,7 +4,6 @@
 
 INSTALLDIR=$(TARGET_HOME)/bin
 LIBDIR=$(TARGET_HOME)/lib/LLgen
-MANDIR=$(TARGET_HOME)/man
 
 all:
 	cd src; make
@@ -18,7 +17,7 @@ install:
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
 	then	cp $(SRC_HOME)/util/LLgen/lib/rec $(LIBDIR)/rec ; \
 		cp $(SRC_HOME)/util/LLgen/lib/incl $(LIBDIR)/incl ; \
-		cp $(SRC_HOME)/util/LLgen/LLgen.1 $(MANDIR)/LLgen.1 ; \
+		mk_manpage $(SRC_HOME)/util/LLgen/LLgen.1 $(TARGET_HOME) ; \
 	fi
 
 firstinstall:
@@ -28,7 +27,7 @@ firstinstall:
 	then	if [ -d $(LIBDIR) ] ; then : ; else mkdir $(LIBDIR) ; fi ; \
 		cp $(SRC_HOME)/util/LLgen/lib/rec $(LIBDIR)/rec ; \
 		cp $(SRC_HOME)/util/LLgen/lib/incl $(LIBDIR)/incl ; \
-		cp $(SRC_HOME)/util/LLgen/LLgen.1 $(MANDIR)/LLgen.1 ; \
+		mk_manpage $(SRC_HOME)/util/LLgen/LLgen.1 $(TARGET_HOME) ; \
 	fi
 
 cmp:
@@ -36,7 +35,6 @@ cmp:
 	-cmp src/LLgen $(INSTALLDIR)/LLgen
 	-cmp $(SRC_HOME)/util/LLgen/lib/rec $(LIBDIR)/rec
 	-cmp $(SRC_HOME)/util/LLgen/lib/incl $(LIBDIR)/incl
-	-cmp $(SRC_HOME)/util/LLgen/LLgen.1 $(MANDIR)/LLgen.1
 
 distr:
 	cd src; make distr
diff --git a/util/ack/proto.make b/util/ack/proto.make
index 0bab9647d..3669274ee 100644
--- a/util/ack/proto.make
+++ b/util/ack/proto.make
@@ -60,7 +60,6 @@ LDFLAGS= $(LDOPTIONS)
 ULDFLAGS= $(ULDOPTIONS)
 BINDIR=$(TARGET_HOME)/bin
 HDIR=$(TARGET_HOME)/h
-MANDIR=$(TARGET_HOME)/man
 MODDIR=$(TARGET_HOME)/modules/lib
 
 all:		ack ack.1
@@ -70,12 +69,11 @@ install:	ack ack.1
 		-cd $(BINDIR) ; \
 		for i in $(INTABLES) $(LNTABLES) ; do rm -f $$i ; ln ack $$i ; done
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp ack.1 $(MANDIR)/ack.1 ; \
+		then	mk_manpage ack.1 $(TARGET_HOME) ; \
 		fi
 
-cmp:		ack ack.1
+cmp:		ack
 		-cmp ack $(BINDIR)/ack
-		-cmp ack.1 $(MANDIR)/ack.1
 
 ack.1:		$(SRC_DIR)/ack.1.X
 		-sh -c 'tbl < $(SRC_DIR)/ack.1.X > ack.1'
diff --git a/util/amisc/proto.make b/util/amisc/proto.make
index 31087ce96..7500640b5 100644
--- a/util/amisc/proto.make
+++ b/util/amisc/proto.make
@@ -3,7 +3,6 @@
 #PARAMS		do not remove this line!
 
 SRC_DIR = $(SRC_HOME)/util/amisc
-MANDIR	= $(TARGET_HOME)/man
 BINDIR  = $(TARGET_HOME)/bin
 LDFLAGS = $(LDOPTIONS)
 INCLUDES = -I$(TARGET_HOME)/h
@@ -28,12 +27,11 @@ ashow:	$(SRC_DIR)/ashow.c
 install:	all
 	for i in $(ALL); do rm -f $(BINDIR)/$$i; cp $$i $(BINDIR)/$$i; done
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then for i in anm.1 asize.1 astrip.1; do rm -f $(MANDIR)/$$i; cp $(SRC_DIR)/$$i $(MANDIR)/$$i; done ; \
+	then	for i in anm.1 asize.1 astrip.1; do mk_manpage $(SRC_DIR)/$$i $(TARGET_HOME) ; done ; \
 	fi
 
 cmp:	all
 	-for i in $(ALL); do cmp $$i $(BINDIR)/$$i; done
-	-for i in anm.1 astrip.1 asize.1 ; do cmp $(SRC_DIR)/$$i $(MANDIR)/$$i; done
 
 clean:	; rm -f $(ALL) *.$(SUF)
 
diff --git a/util/arch/proto.make b/util/arch/proto.make
index 004b548df..338b3b126 100644
--- a/util/arch/proto.make
+++ b/util/arch/proto.make
@@ -5,7 +5,6 @@
 SRC_DIR = $(SRC_HOME)/util/arch
 EMH = $(TARGET_HOME)/h
 EMBIN = $(TARGET_HOME)/bin
-EMMAN = $(TARGET_HOME)/man
 LIB = $(TARGET_HOME)/modules/lib
 ULIB = $(UTIL_HOME)/modules/lib
 
@@ -48,15 +47,14 @@ install :       all
 		cp aal $(EMBIN)/aal
 		cp arch $(EMBIN)/arch
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/aal.1 $(SRC_DIR)/arch.1 $(SRC_DIR)/arch.5 $(EMMAN) ; \
+		then	mk_manpage $(SRC_DIR)/aal.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/arch.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/arch.5 $(TARGET_HOME) ; \
 		fi
 
 cmp :           all
 		-cmp aal $(EMBIN)/aal
 		-cmp arch $(EMBIN)/arch
-		-cmp $(SRC_DIR)/aal.1 $(EMMAN)/aal.1
-		-cmp $(SRC_DIR)/arch.1 $(EMMAN)/arch.1
-		-cmp $(SRC_DIR)/arch.5 $(EMMAN)/arch.5
 
 opr:
 		make pr ^ opr
diff --git a/util/ass/proto.make b/util/ass/proto.make
index 4cababc62..db5c8d5cf 100644
--- a/util/ass/proto.make
+++ b/util/ass/proto.make
@@ -26,12 +26,11 @@ clean:
 install :       all
 		cp ass $(TARGET_HOME)/lib.bin/em_ass
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/em_ass.6 $(TARGET_HOME)/man/em_ass.6 ; \
+		then	mk_manpage $(SRC_DIR)/em_ass.6 $(TARGET_HOME) ; \
 		fi
 
 cmp :           all
 		-cmp ass $(TARGET_HOME)/lib.bin/em_ass
-		-cmp $(SRC_DIR)/em_ass.6 $(TARGET_HOME)/man/em_ass.6
 
 lint:		asstb.c
 		$(LINT) $(LINTFLAGS) $(CFILES)
diff --git a/util/byacc/proto.make b/util/byacc/proto.make
index 8a02982f5..1691da861 100644
--- a/util/byacc/proto.make
+++ b/util/byacc/proto.make
@@ -4,7 +4,6 @@
 
 SRC_DIR		= $(SRC_HOME)/util/byacc
 DEST		= $(TARGET_HOME)/bin
-MAN		= $(TARGET_HOME)/man
 
 HDRS		= $(SRC_DIR)/defs.h
 
@@ -52,12 +51,13 @@ clean:
 install:	$(PROGRAM)
 		cp $(PROGRAM) $(DEST)/$(PROGRAM)
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/manpage $(MAN)/yacc.1 ; \
+		then	cp $(SRC_DIR)/manpage yacc.1 ; \
+			mk_manpage yacc.1 $(TARGET_HOME) ; \
+			rm -f yacc.1 ; \
 		fi
 
 cmp:		$(PROGRAM)
 		-cmp $(PROGRAM) $(DEST)/$(PROGRAM)
-		-cmp $(SRC_DIR)/manpage $(MAN)/yacc.1
 
 pr:
 		@pr proto.make $(HDRS) $(SRCS)
diff --git a/util/cmisc/proto.make b/util/cmisc/proto.make
index 7058f0cbe..11c154dd0 100644
--- a/util/cmisc/proto.make
+++ b/util/cmisc/proto.make
@@ -4,7 +4,6 @@
 
 SRC_DIR = $(SRC_HOME)/util/cmisc
 TARGET_BIN = $(TARGET_HOME)/bin
-TARGET_MAN = $(TARGET_HOME)/man
 CFLAGS = $(COPTIONS)
 LDFLAGS = $(LDOPTIONS)
 LINTFLAGS = $(LINTOPTIONS)
@@ -14,7 +13,10 @@ all:		cid cclash prid tabgen
 install:	all
 		cp cid cclash prid tabgen $(TARGET_BIN)
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/cid.1 $(SRC_DIR)/cclash.1 $(SRC_DIR)/prid.1 $(SRC_DIR)/tabgen.1 $(TARGET_MAN) ; \
+		then	mk_manpage $(SRC_DIR)/cid.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/cclash.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/prid.1 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/tabgen.1 $(TARGET_HOME) ; \
 		fi
 
 cmp:		all
@@ -22,10 +24,6 @@ cmp:		all
 		-cmp cclash $(TARGET_BIN)/cclash
 		-cmp prid $(TARGET_BIN)/prid
 		-cmp tabgen $(TARGET_BIN)/tabgen
-		-cmp $(SRC_DIR)/cid.1 $(TARGET_MAN)/cid.1
-		-cmp $(SRC_DIR)/cclash.1 $(TARGET_MAN)/cclash.1
-		-cmp $(SRC_DIR)/prid.1 $(TARGET_MAN)/prid.1
-		-cmp $(SRC_DIR)/tabgen.1 $(TARGET_MAN)/tabgen.1
 
 clean:
 		rm -f *.$(SUF) cid cclash prid tabgen
diff --git a/util/cpp/proto.make b/util/cpp/proto.make
index 5555abc36..8da647639 100644
--- a/util/cpp/proto.make
+++ b/util/cpp/proto.make
@@ -9,7 +9,6 @@ UMODULES=$(UTIL_HOME)/modules
 MODULESLIB=$(MODULES)/lib
 UMODULESLIB=$(UMODULES)/lib
 BIN=$(TARGET_HOME)/lib.bin
-MANDIR=$(TARGET_HOME)/man
 
 # Libraries
 SYSLIB = $(MODULESLIB)/libsystem.$(LIBSUF)
@@ -114,12 +113,11 @@ cfiles: hfiles LLfiles $(GSRC)
 install: all
 	cp cpp $(CEMPP)
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then cp $(SRC_DIR)/cpp.6 $(MANDIR)/cpp.6 ; \
+	then	mk_manpage $(SRC_DIR)/cpp.6 $(TARGET_HOME) ; \
 	fi
 
 cmp:	all
 	-cmp cpp $(CEMPP)
-	-cmp $(SRC_DIR)/cpp.6 $(MANDIR)/cpp.6
 
 pr: 
 	@pr $(PRFILES)
diff --git a/util/flex/proto.make b/util/flex/proto.make
index 800593a6c..ede20a85a 100644
--- a/util/flex/proto.make
+++ b/util/flex/proto.make
@@ -40,15 +40,10 @@ SRC_DIR = $(SRC_HOME)/util/flex
 # Installation targeting.  Files will be installed under the tree rooted
 # at DESTDIR.  User commands will be installed in BINDIR, library files
 # in LIBDIR (which will be created if necessary), auxiliary files in
-# AUXDIR, manual pages will be installed in MANDIR with extension MANEXT.
-# Raw, unformatted troff source will be installed if INSTALLMAN=man, nroff
-# preformatted versions will be installed if INSTALLMAN=cat.
+# AUXDIR;
 DESTDIR =
 BINDIR = $(TARGET_HOME)/bin
 AUXDIR = $(TARGET_HOME)/lib/flex
-MANDIR = $(TARGET_HOME)/man
-MANEXT = 1
-INSTALLMAN = man
 
 # MAKE = make
 
@@ -142,15 +137,28 @@ LINTFLAGS = $(LINTOPTIONS) $(INCLUDES)
 lint : $(FLEX_C_SOURCES)
 	$(LINT) $(LINTFLAGS) $(FLEX_C_SOURCES)
 
-install: first_flex $(SRC_DIR)/flex.skel
+firstinstall: first_flex $(SRC_DIR)/flex.skel
 	rm -f $(BINDIR)/flex
 	cp flex $(BINDIR)/flex
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
 	then	cp $(SRC_DIR)/flex.skel $(AUXDIR)/flex.skel ; \
-		cp $(SRC_DIR)/flex.1 $(MANDIR)/flex.1 ; \
-		cp $(SRC_DIR)/flexdoc.1 $(MANDIR)/flexdoc.1 ; \
+		mk_manpage $(SRC_DIR)/flex.1 $(TARGET_HOME) ; \
+		mk_manpage $(SRC_DIR)/flexdoc.1 $(TARGET_HOME) ; \
 	fi
 
+install: flex $(SRC_DIR)/flex.skel
+	rm -f $(BINDIR)/flex
+	cp flex $(BINDIR)/flex
+	if [ $(DO_MACHINE_INDEP) = y ] ; \
+	then	cp $(SRC_DIR)/flex.skel $(AUXDIR)/flex.skel ; \
+		mk_manpage $(SRC_DIR)/flex.1 $(TARGET_HOME) ; \
+		mk_manpage $(SRC_DIR)/flexdoc.1 $(TARGET_HOME) ; \
+	fi
+
+cmp: flex $(SRC_DIR)/flex.skel
+	-cmp flex $(BINDIR)/flex
+	-cmp $(SRC_DIR)/flex.skel $(AUXDIR)/flex.skel 
+
 clean :
 	rm -f core errs flex *.$(SUF) parse.c *.lint parse.h tags
 
diff --git a/util/grind/proto.make b/util/grind/proto.make
index 6badfa9ba..3eefbf034 100644
--- a/util/grind/proto.make
+++ b/util/grind/proto.make
@@ -69,12 +69,11 @@ all:		make.main
 install:	all
 		cp grind $(TARGET_HOME)/bin/grind
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then cp $(SRC_DIR)/grind.1 $(TARGET_HOME)/man/grind.1 ; \
+		then	mk_manpage $(SRC_DIR)/grind.1 $(TARGET_HOME) ; \
 		fi
 
 cmp:		all
 		-cmp grind $(TARGET_HOME)/bin/grind
-		-cmp $(SRC_DIR)/grind.1 $(TARGET_HOME)/man/grind.1
 
 opr:
 		make pr | opr
diff --git a/util/int/proto.make b/util/int/proto.make
index b00ef6a8b..8733b5cf2 100644
--- a/util/int/proto.make
+++ b/util/int/proto.make
@@ -92,12 +92,11 @@ all:	test
 install:	$(INT)
 	cp $(INT) $(TARGET_HOME)/bin/int
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	cp $(SRC_DIR)/int.1 $(TARGET_HOME)/man/int.1 ; \
+	then	mk_manpage $(SRC_DIR)/int.1 $(TARGET_HOME) ; \
 	fi
 
 cmp:	$(INT)
 	-cmp $(INT) $(TARGET_HOME)/bin/int
-	-cmp $(SRC_DIR)/int.1 $(TARGET_HOME)/man/int.1
 
 test:	$(INT) test/awa.em22 test/awa.em24 test/awa.em44
 	@rm -f int.mess
diff --git a/util/led/proto.make b/util/led/proto.make
index 3937ccf10..bdb8612a3 100644
--- a/util/led/proto.make
+++ b/util/led/proto.make
@@ -52,14 +52,12 @@ led:	$(OFILES)
 install:led
 	cp led $(LIBDIR)/em_led
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then	cp $(SRC_DIR)/led.6 $(TARGET_HOME)/man/led.6 ; \
-		cp $(SRC_DIR)/ack.out.5 $(TARGET_HOME)/man/ack.out.5 ; \
+	then	mk_manpage $(SRC_DIR)/led.6 $(TARGET_HOME) ; \
+		mk_manpage $(SRC_DIR)/ack.out.5 $(TARGET_HOME) ; \
 	fi
 
 cmp:	led
 	-cmp led $(LIBDIR)/em_led
-	-cmp $(SRC_DIR)/led.6 $(TARGET_HOME)/man/led.6
-	-cmp $(SRC_DIR)/ack.out.5 $(TARGET_HOME)/man/ack.out.5
 
 lint:
 	lint $(LINTFLAGS) $(CFILES) $(LINTLIBS)
diff --git a/util/misc/proto.make b/util/misc/proto.make
index bd2dd4b7d..0f6483dde 100644
--- a/util/misc/proto.make
+++ b/util/misc/proto.make
@@ -65,16 +65,14 @@ install :       all
 		cp $(ENC_PATH) $l/em_$(ENC_PATH)
 		cp esize $(TARGET_HOME)/bin/esize
 		if [ $(DO_MACHINE_INDEP) = y ] ; \
-		then	cp $(SRC_DIR)/em_decode.6 $(TARGET_HOME)/man/em_decode.6 ; \
-			cp $(SRC_DIR)/esize.1 $(TARGET_HOME)/man/esize.1 ; \
+		then	mk_manpage $(SRC_DIR)/em_decode.6 $(TARGET_HOME) ; \
+			mk_manpage $(SRC_DIR)/esize.1 $(TARGET_HOME) ; \
 		fi
 
 cmp :           all
 		-cmp $(DEC_PATH) $l/em_$(DEC_PATH)
 		-cmp $(ENC_PATH) $l/em_$(ENC_PATH)
 		-cmp esize $(TARGET_HOME)/bin/esize
-		-cmp $(SRC_DIR)/em_decode.6 $(TARGET_HOME)/man/em_decode.6
-		-cmp $(SRC_DIR)/esize.1 $(TARGET_HOME)/man/esize.1
 
 opr:
 		make pr ^ opr
diff --git a/util/ncgg/proto.make b/util/ncgg/proto.make
index aabc88130..f0647ced6 100644
--- a/util/ncgg/proto.make
+++ b/util/ncgg/proto.make
@@ -20,7 +20,6 @@ SOURCES=$(SRC_DIR)/*.h $(SRC_DIR)/cgg.y $(SRC_DIR)/scan.l \
 
 SRC_DIR=$(SRC_HOME)/util/ncgg
 EMH=$(TARGET_HOME)/h
-MANDIR=$(TARGET_HOME)/man
 INCLUDES=-I$(EMH) -I$(TARGET_HOME)/config -I$(SRC_DIR) -I.
 CFLAGS=$(INCLUDES) $(COPTIONS)
 YFLAGS=-d
@@ -34,12 +33,11 @@ cgg:	cgg.$(SUF) $(OFILES) output.$(SUF)
 install:	cgg
 	cp cgg $(TARGET_HOME)/lib.bin/ncgg
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then cp $(SRC_DIR)/ncgg.6 $(MANDIR)/ncgg.6 ; \
+	then	mk_manpage $(SRC_DIR)/ncgg.6 $(TARGET_HOME) ; \
 	fi
 
 cmp:	cgg
 	-cmp cgg $(TARGET_HOME)/lib.bin/ncgg
-	-cmp $(SRC_DIR)/ncgg.6 $(MANDIR)/ncgg.6
 
 debugcgg:	cgg.$(SUF) $(OFILES) debugoutput.$(SUF)
 	$(CC) $(LDFLAGS) $(OFILES) debugoutput.$(SUF) $(TARGET_HOME)/lib.bin/em_data.$(LIBSUF) -o cgg
diff --git a/util/opt/proto.make b/util/opt/proto.make
index 70cb301a1..1fc06cc04 100644
--- a/util/opt/proto.make
+++ b/util/opt/proto.make
@@ -40,13 +40,12 @@ test:	opt testopt
 cmp:	all
 	-cmp opt $(TARGET_HOMTARGET_HOME)/lib.bin/em_opt
 	-cmp opt2 $(TARGET_HOME)/lib.bin/em_opt2
-	-cmp $(SRC_DIR)/em_opt.6 $(TARGET_HOME)/man/em_opt.6
 
 install:all
 	cp opt $(TARGET_HOME)/lib.bin/em_opt
 	cp opt2 $(TARGET_HOME)/lib.bin/em_opt2
 	if [ $(DO_MACHINE_INDEP) = y ] ; \
-	then cp $(SRC_DIR)/em_opt.6 $(TARGET_HOME)/man/em_opt.6 ; \
+	then	mk_manpage $(SRC_DIR)/em_opt.6 $(TARGET_HOME) ; \
 	fi
 
 pattern.c:	$(SRC_DIR)/patterns mktab