1 files changed, 26 insertions, 11 deletions

diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 94716f1afcb7..28ce582decc8 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -5,31 +5,46 @@
 TMACOWN?=	${BINOWN}
 TMACGRP?=	${BINGRP}
 TMACMODE?=	${NOBINMODE}
-TMACDIR?=	/usr/share/tmac
+TMACDIR?=	${SHAREDIR}/tmac
 MDOCDIR?=	${TMACDIR}/mdoc
 LOCALEDIR?=     ${MDOCDIR}/locale
 
-MAN7=           groff_ms.7 groff_me.7 groff_msafer.7
-MLINKS=         groff_ms.7 ms.7 groff_me.7 me.7 groff_msafer.7 msafer.7
+MAN5=		groff_tmac.5
+MLINKS+=	groff_tmac.5 tmac.5
+MAN7=		groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7 groff_markup.7
+MLINKS+=	groff_ms.7 ms.7
+MLINKS+=	groff_me.7 me.7
+MLINKS+=	groff_msafer.7 msafer.7
+MLINKS+=	groff_markup.7 markup.7
 LINKS=          ${TMACDIR}/tmac.andoc ${TMACDIR}/tmac.an
 
-CLEANFILES=	${MAN7} ${MDOCFILES} ${STRIPFILES} tmac.groff_an
+CLEANFILES=	${MAN5} ${MAN7} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
+CLEANFILES+=	tmac.groff_an
 
-FILES=          tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold\
-		tmac.pspic tmac.psatk tmac.dvi tmac.safer tmac.tty \
-		tmac.tty-char tmac.X tmac.Xps tmac.latin1 tmac.lj4 eqnrc \
-		troffrc tmac.arkup tmac.html
-STRIPFILES=     tmac.e tmac.s tmac.doc
+FILES=          tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold \
+		tmac.pspic tmac.psatk tmac.dvi tmac.tty tmac.tty-char \
+		tmac.X tmac.Xps tmac.latin1 tmac.lj4 eqnrc troffrc troffrc-end \
+		tmac.safer tmac.html tmac.markup tmac.arkup tmac.a4 \
+		tmac.trace tmac.me tmac.mdoc tmac.s tmac.lbp
+STRIPFILES=     tmac.e tmac.doc
+SPECIALFILES=	tmac.man tmac.ms
 MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
 LOCALEFILES=    locale-list koi8-r
 
-all: ${MDOCFILES} ${STRIPFILES} tmac.groff_an
+all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES} tmac.groff_an
 
 .for f in ${MDOCFILES} ${STRIPFILES}
 $f: ${DIST_DIR}/$f
 	sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
 .endfor
 
+.for f in ${SPECIALFILES}
+$f: ${DIST_DIR}/$f
+	sed -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
+	    -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+		${.ALLSRC} > ${.TARGET}
+.endfor
+
 tmac.groff_an: tmac.an
 	sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
 
@@ -37,7 +52,7 @@ beforeinstall:
 	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    ${MDOCFILES} ${DESTDIR}${MDOCDIR}
 	${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-	    ${STRIPFILES} tmac.groff_an ${DESTDIR}${TMACDIR}
+	    ${STRIPFILES} ${SPECIALFILES} tmac.groff_an ${DESTDIR}${TMACDIR}
 	cd ${DIST_DIR}; \
 	    ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 	    ${FILES} ${DESTDIR}${TMACDIR}