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

diff --git a/Makefile.conf b/Makefile.conf
index fe53b4df94908e538aba682e7cede4ab162a17f9..d388c12421da415aecd7d8a4dd814e62695bad51 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -194,7 +194,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp       # see rationale in includes/cf/linux.h
 #SCRIPT=linux
@@ -208,7 +208,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp       # see rationale in includes/cf/linux.h
 #SCRIPT=linux
@@ -222,7 +222,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/share/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp       # see rationale in includes/cf/linux.h
 #SCRIPT=linux
@@ -236,7 +236,7 @@ VARDB = /var/db
 #ADMMANEXT = .8
 #FFMANDIR = /usr/share/man/man5
 #FFMANEXT = .5
-#MANCAT =
+#MANCAT = man
 #VARRUN = /var/run
 #VARDB = /var/state/dhcp       # see rationale in includes/cf/linux.h
 #SCRIPT=linux
@@ -268,7 +268,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
@@ -311,7 +311,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 ef1a211528dec510f628f328764395ad57c6e1cb..3c881ed302728de0bf0dc1b926f4d053f6391484 100644 (file)
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -86,24 +86,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.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.conf.cat5:    dhclient.conf.5
-       nroff -man dhclient.conf.5 >dhclient.conf.cat5
+dhclient.conf.cat5:    dhclient.conf.man5
+       nroff -man dhclient.conf.man5 >dhclient.conf.cat5
 
-dhclient.leases.cat5:  dhclient.leases.5
+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)
        $(CC) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPLIB) $(LIBS)

diff --git a/common/Makefile.dist b/common/Makefile.dist
index 415fab1007bf6d1811997a94d96734eb4e5995bc..a131baf8320df0a43c676c30f64a0e8758004311 100644 (file)
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -74,7 +74,11 @@ 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-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
 
 # Dependencies (semi-automatically-generated)

diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index b7f895884ab1f0d957d9995e1ab689492894d056..befb64c0e4847c9323cc700b02d51d0b53095643 100644 (file)
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -72,10 +72,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 6caa669f2ccf8b073ef8efc99b9190611675f593..c5341ff4b2e84fa1a54ad989a199cd0176be6aee 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -76,18 +76,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)