More changes to use __FBSDID() for setting rcsids, and fix the

format of 'sccsid' lines so they consistently match style(9).
A minor Makefile change is needed so lptest.c can find lp.cdefs.h.

Reviewed by:	discussed with bde and obrien
MFC after:	15 days

usr.sbin/lpr/lptest/Makefile

@@ -3,4 +3,6 @@
 
 PROG=	lptest
 
+CFLAGS+= -I${.CURDIR}/../common_source
+
 .include <bsd.prog.mk>

usr.sbin/lpr/lptest/lptest.c

@@ -38,13 +38,14 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)lptest.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+
+#include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
 
 #include <stdlib.h>
 #include <stdio.h>