diff options
| -rw-r--r-- | contrib/groff/tmac/troffrc | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/tmac/Makefile | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc index 7147512..755bc39 100644 --- a/contrib/groff/tmac/troffrc +++ b/contrib/groff/tmac/troffrc @@ -45,7 +45,4 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html . .\} . -.\" Disable SGR support in grotty(1). -.if n .do output "x X tty: sgr 0 -. .\" Don't let blank lines creep in here. diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index d32f620..a9a9873 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -14,6 +14,7 @@ MLINKS+= groff_me.7 me.7 MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -32,7 +33,7 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc troffrc-end \ + troffrc \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -40,6 +41,7 @@ MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms \ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -53,6 +55,9 @@ $f-s: $f ${.ALLSRC} > ${.TARGET} .endfor +troffrc-end.patched: troffrc-end + (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} + beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -61,6 +66,8 @@ beforeinstall: ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f |
