- revert change to accessing ../man/ includes as <man/xxx.h>; it's

ugly to add -I.../usr.bin to do this.  instead, add appropriate
  comments in the source to where the files are actually coming from.
- use NETBSDSRCDIR as appropriate
- some minor makefile delint
This commit is contained in:
lukem 2002-09-19 11:29:54 +00:00
parent 87048d2661
commit 3bcb486fa2
4 changed files with 23 additions and 14 deletions

View File

@ -1,9 +1,14 @@
# $NetBSD: Makefile,v 1.10 2002/09/13 20:16:40 mycroft Exp $
# $NetBSD: Makefile,v 1.11 2002/09/19 11:29:54 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
MDIST= ${NETBSDSRCDIR}/usr.bin/man
PROG= apropos
SRCS= apropos.c manconf.c
.PATH: ${.CURDIR}/../man
CPPFLAGS+=-I${.CURDIR}/..
.PATH: ${MDIST}
CPPFLAGS+=-I${MDIST}
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
/* $NetBSD: apropos.c,v 1.20 2002/09/13 20:16:40 mycroft Exp $ */
/* $NetBSD: apropos.c,v 1.21 2002/09/19 11:29:54 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: apropos.c,v 1.20 2002/09/13 20:16:40 mycroft Exp $");
__RCSID("$NetBSD: apropos.c,v 1.21 2002/09/19 11:29:54 lukem Exp $");
#endif
#endif /* not lint */
@ -60,8 +60,8 @@ __RCSID("$NetBSD: apropos.c,v 1.20 2002/09/13 20:16:40 mycroft Exp $");
#include <string.h>
#include <unistd.h>
#include <man/manconf.h>
#include <man/pathnames.h>
#include "manconf.h" /* from ../man/ */
#include "pathnames.h" /* from ../man/ */
static int *found, foundman;

View File

@ -1,9 +1,13 @@
# $NetBSD: Makefile,v 1.7 2002/09/13 20:27:52 mycroft Exp $
# $NetBSD: Makefile,v 1.8 2002/09/19 11:29:54 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
MDIST= ${NETBSDSRCDIR}/usr.bin/man
PROG= whatis
SRCS= whatis.c manconf.c
.PATH: ${.CURDIR}/../man
CPPFLAGS+=-I${.CURDIR}/..
.PATH: ${MDIST}
CPPFLAGS+=-I${MDIST}
.include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
/* $NetBSD: whatis.c,v 1.16 2002/09/13 20:27:53 mycroft Exp $ */
/* $NetBSD: whatis.c,v 1.17 2002/09/19 11:29:55 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)whatis.c 8.5 (Berkeley) 1/2/94";
#else
__RCSID("$NetBSD: whatis.c,v 1.16 2002/09/13 20:27:53 mycroft Exp $");
__RCSID("$NetBSD: whatis.c,v 1.17 2002/09/19 11:29:55 lukem Exp $");
#endif
#endif /* not lint */
@ -59,8 +59,8 @@ __RCSID("$NetBSD: whatis.c,v 1.16 2002/09/13 20:27:53 mycroft Exp $");
#include <string.h>
#include <unistd.h>
#include <man/manconf.h>
#include <man/pathnames.h>
#include "manconf.h" /* from ../man/ */
#include "pathnames.h" /* from ../man/ */
#define MAXLINELEN 8192 /* max line handled */