diff options
| author | mpp <mpp@FreeBSD.org> | 1996-12-19 22:40:43 +0000 |
|---|---|---|
| committer | mpp <mpp@FreeBSD.org> | 1996-12-19 22:40:43 +0000 |
| commit | 5350b64f0143e9004d38e286bc55e56fb12fcd48 (patch) | |
| tree | a79f0477070e5310fae02827f4bf755ca424d0bf /share/mk/bsd.doc.mk | |
| parent | 9461a5fafa47097b9c17bdd0acc5c51cce5336f8 (diff) | |
| download | FreeBSD-src-5350b64f0143e9004d38e286bc55e56fb12fcd48.zip FreeBSD-src-5350b64f0143e9004d38e286bc55e56fb12fcd48.tar.gz | |
Change bsd.doc.mk to use the variable PRINTERDEVICE instead
of PRINTER for defining the default output device when formatting
documents for installation. This prevents problems if the
user has defined PRINTER for use by lpr.
Closes PR# 1437.
Diffstat (limited to 'share/mk/bsd.doc.mk')
| -rw-r--r-- | share/mk/bsd.doc.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index a73c264..f819973 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -1,16 +1,16 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $Id: bsd.doc.mk,v 1.25 1996/06/24 04:23:54 jkh Exp $ +# $Id: bsd.doc.mk,v 1.26 1996/09/03 15:14:44 bde Exp $ -PRINTER?= ascii +PRINTERDEVICE?= ascii BIB?= bib -EQN?= eqn -T${PRINTER} +EQN?= eqn -T${PRINTERDEVICE} GREMLIN?= grn GRIND?= vgrind -f INDXBIB?= indxbib PIC?= pic REFER?= refer -.if ${PRINTER} == "ascii" +.if ${PRINTERDEVICE} == "ascii" ROFF?= groff -mtty-char ${TRFLAGS} ${MACROS} -o${PAGES} .else ROFF?= groff ${TRFLAGS} ${MACROS} -o${PAGES} @@ -25,7 +25,7 @@ TBL?= tbl DOC?= paper -TRFLAGS+= -T${PRINTER} +TRFLAGS+= -T${PRINTERDEVICE} .if defined(USE_EQN) TRFLAGS+= -e .endif @@ -43,10 +43,10 @@ TRFALGS+= -R .endif .if defined(NODOCCOMPRESS) -DFILE= ${DOC}.${PRINTER} +DFILE= ${DOC}.${PRINTERDEVICE} GZIPCMD= cat .else -DFILE= ${DOC}.${PRINTER}.gz +DFILE= ${DOC}.${PRINTERDEVICE}.gz GZIPCMD= gzip -c .endif @@ -64,14 +64,14 @@ all: ${DFILE} .if !target(print) print: ${DFILE} .if defined(NODOCCOMPRESS) - lpr -P${PRINTER} ${DFILE} + lpr -P${PRINTERDEVICE} ${DFILE} .else - ${GZIPCMD} -d ${DFILE} | lpr -P${PRINTER} + ${GZIPCMD} -d ${DFILE} | lpr -P${PRINTERDEVICE} .endif .endif clean: - rm -f ${DOC}.${PRINTER} ${DOC}.ps ${DOC}.ascii \ + rm -f ${DOC}.${PRINTERDEVICE} ${DOC}.ps ${DOC}.ascii \ ${DOC}.ps.gz ${DOC}.ascii.gz Errs errs mklog ${CLEANFILES} FILES?= ${SRCS} @@ -117,8 +117,8 @@ ${DFILE}:: ${SRCS} .endif .else .if !defined(NODOCCOMPRESS) -${DFILE}: ${DOC}.${PRINTER} - ${GZIPCMD} ${DOC}.${PRINTER} > ${.TARGET} +${DFILE}: ${DOC}.${PRINTERDEVICE} + ${GZIPCMD} ${DOC}.${PRINTERDEVICE} > ${.TARGET} .endif .endif |
