From 2a4873e853f45748cb1bf33254638f38f3498cf1 Mon Sep 17 00:00:00 2001 From: gad Date: Tue, 15 Jul 2003 07:01:01 +0000 Subject: More changes to use __FBSDID() for setting rcsids. For the filter programs, minor Makefile changes are needed to find lp.cdefs.h. For lpf.c, the 'sccsid' line is formatted to match style(9), and a 'From:' is removed so the sccsid returns to what it was back in the days of '-r CSRG' (1994). Reviewed by: discussed with bde and obrien MFC after: 15 days --- usr.sbin/lpr/filters/Makefile | 2 ++ usr.sbin/lpr/filters/lpf.c | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'usr.sbin/lpr/filters') diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index c8bdca7..100022d 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -6,4 +6,6 @@ BINDIR= /usr/libexec/lpr PROG= lpf NOMAN= noman +CFLAGS+= -I${.CURDIR}/../common_source + .include diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c index 7c759bb..41879a2 100644 --- a/usr.sbin/lpr/filters/lpf.c +++ b/usr.sbin/lpr/filters/lpf.c @@ -37,13 +37,14 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#if 0 #ifndef lint -/* -static char sccsid[] = "From: @(#)lpf.c 8.1 (Berkeley) 6/6/93"; -*/ -static const char rcsid[] = - "$FreeBSD$"; +static char sccsid[] = "@(#)lpf.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ +#endif + +#include "lp.cdefs.h" /* A cross-platform version of */ +__FBSDID("$FreeBSD$"); /* * filter which reads the output of nroff and converts lines -- cgit v1.1