Do path keyword substitution on unformatted manual pages prior to installing.

diff --git a/Makefile.conf b/Makefile.conf
index 24179e2a0816f7bffc60abbfbfbb87cd0d1559b6..0290c7f7690194f852b78b2e0948f64f622dd2e1 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -182,7 +182,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
 #SCRIPT=linux
@@ -196,7 +196,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
 #SCRIPT=linux
@@ -210,7 +210,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp
 #SCRIPT=linux
@@ -224,7 +224,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/dhcpd
 #SCRIPT=linux
@@ -256,7 +256,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /etc
 #COPTS=-w3 -Dlint
 #LFLAGS=$(DEBUG) "-Wl,op symfile" -l socket
@@ -299,7 +299,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/local/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #INSTALL = install
 #MANINSTALL = install
 #CHMOD = chmod

diff --git a/client/Makefile.dist b/client/Makefile.dist
index b70b30b17ba5e9d357027aab6a482119aaca2169..232617b77dd9ccf2733873299319510296474bd1 100644 (file)
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -76,23 +76,36 @@ distclean: realclean
 # macros aren't available on older unices.   Catted man pages are
 # provided in the distribution so that this doesn't become a problem.
 
-dhclient.cat8: dhclient.8
+dhclient.cat8: dhclient.man8
+       nroff -man dhclient.man8 >dhclient.man8
+
+dhclient.man8: dhclient.8
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-               -e "s#RUNDIR#$(VARRUN)#g" < dhclient.8 \
-                       | nroff -man >dhclient.cat8
+               -e "s#RUNDIR#$(VARRUN)#g" < dhclient.8 >dhclient.man8
+
+dhclient-script.cat8:  dhclient-script.man8
+       nroff -man dhclient-script.man8 >dhclient-script.cat8
 
-dhclient-script.cat8:  dhclient-script.8
+dhclient-script.man8:  dhclient-script.8
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
                -e "s#RUNDIR#$(VARRUN)#g" < dhclient-script.8 \
-                       | nroff -man >dhclient-script.cat8
+                                               >dhclient-script.man8
 
-dhclient.conf.cat5:    dhclient.conf.5
-       nroff -man dhclient.conf.5 >dhclient.conf.cat5
+dhclient.conf.man5:    dhclient.conf.5
+       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
+               -e "s#RUNDIR#$(VARRUN)#g" < dhclient.conf.5 \
+                                               >dhclient.conf.man5
 
-dhclient.leases.cat5:  dhclient.leases.5
+dhclient.conf.cat5:    dhclient.conf.man5
+       nroff -man dhclient.conf.man5 >dhclient.conf.cat5
+
+dhclient.leases.man5:  dhclient.leases.5
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
                -e "s#RUNDIR#$(VARRUN)#g" < dhclient.leases.5 \
-                       | nroff -man >dhclient.leases.cat5
+                                               >dhclient.leases.man5
+
+dhclient.leases.cat5:  dhclient.leases.man5
+       nroff -man dhclient.leases.man5 >dhclient.leases.cat5
 
 
 dhclient:      $(OBJS) $(DHCPLIB)

diff --git a/common/Makefile.dist b/common/Makefile.dist
index 7b89176da6d9095ca80d38f38a1869bd554c72b1..40b8c4c2bccb26d2239713dbea72932a8b62bfc8 100644 (file)
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -69,13 +69,25 @@ realclean: clean
 distclean: realclean
        -rm -f Makefile
 
-dhcp-options.cat5:     dhcp-options.5
-       nroff -man dhcp-options.5 >dhcp-options.cat5
+dhcp-options.cat5:     dhcp-options.man5
+       nroff -man dhcp-options.man5 >dhcp-options.cat5
 
-dhcp-eval.cat5:        dhcp-eval.5
-       nroff -man dhcp-eval.5 >dhcp-eval.cat5
+dhcp-options.man5:     dhcp-options.5
+       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcp-options.5 >dhcp-options.man5
 
-dhcp-contrib.cat5:     dhcp-contrib.5
-       nroff -man dhcp-contrib.5 >dhcp-contrib.cat5
+dhcp-eval.cat5:        dhcp-eval.man5
+       nroff -man dhcp-eval.man5 >dhcp-eval.cat5
+
+dhcp-eval.man5:        dhcp-eval.5
+       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcp-eval.5 >dhcp-eval.man5
+
+dhcp-contrib.cat5:     dhcp-contrib.man5
+       nroff -man dhcp-contrib.man5 >dhcp-contrib.cat5
+
+dhcp-contrib.man5:     dhcp-contrib.5
+       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcp-contrib.5 >dhcp-contrib.man5
 
 # Dependencies (semi-automatically-generated)

diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index e5e393e902d3028afac87c6d3ac5d4b0f669050d..74db97afd3e1763eeaef042da2572060329fde29 100644 (file)
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -62,10 +62,12 @@ distclean: realclean
 # macros aren't available on older unices.   Catted man pages are
 # provided in the distribution so that this doesn't become a problem.
 
-dhcrelay.cat8: dhcrelay.8
+dhcrelay.cat8: dhcrelay.man8
+       nroff -man dhcrelay.man8 >dhcrelay.cat8
+
+dhcrelay.man8: dhcrelay.8
        sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDB)#" \
-               -e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 \
-                       | nroff -man >dhcrelay.cat8
+               -e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 >dhcrelay.man8
 
 dhcrelay:      dhcrelay.o $(DHCPLIB)
        $(CC) $(LFLAGS) -o $(PROG) dhcrelay.o $(DHCPLIB) $(LIBS)

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 6bdaf3335a0df121b070da6ba5ec3f428789f7a5..1f37191624b0ce0c10c1465f5a79ca2993506798 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -66,18 +66,26 @@ distclean: realclean
 # macros aren't available on older unices.   Catted man pages are
 # provided in the distribution so that this doesn't become a problem.
 
-dhcpd.cat8:    dhcpd.8
+dhcpd.cat8:    dhcpd.man8
+       nroff -man dhcpd.man8 >dhcpd.cat8
+
+dhcpd.man8:    dhcpd.8
+       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.8 >dhcpd.man8
+
+dhcpd.conf.cat5:       dhcpd.conf.man5
+       nroff -man dhcpd.conf.man5 >dhcpd.conf.cat5
+
+dhcpd.conf.man5:       dhcpd.conf.5
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-               -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.8 \
-                       | nroff -man >dhcpd.cat8
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.conf.5 >dhcpd.conf.man5
 
-dhcpd.conf.cat5:       dhcpd.conf.5
-       nroff -man dhcpd.conf.5 >dhcpd.conf.cat5
+dhcpd.leases.cat5:     dhcpd.leases.man5
+       nroff -man dhcpd.leases.man5 >dhcpd.leases.cat5
 
-dhcpd.leases.cat5:     dhcpd.leases.5
+dhcpd.leases.man5:     dhcpd.leases.5
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-               -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 \
-                       | nroff -man >dhcpd.leases.cat5
+               -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5
 
 dhcpd: $(OBJS) $(COBJ) $(DHCPLIB)
        $(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)