diff options
| author | christos <christos@NetBSD.org> | 2013-01-14 18:01:59 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2013-01-14 18:01:59 +0000 |
| commit | 22da5e7cf682e2d164cd91bec5a679307e91968c (patch) | |
| tree | a190cb67d8c9a27241a37e833238a8c54126b9f1 | |
| parent | e1f9977bf778856197d4be4b56fa3d4154d7208c (diff) | |
Since mdocml decided to name headers that conflict with system ones (term.h)
move the header inclusion one up.
| -rw-r--r-- | usr.sbin/makemandb/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/makemandb/apropos-utils.c | 6 | ||||
| -rw-r--r-- | usr.sbin/makemandb/makemandb.c | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/usr.sbin/makemandb/Makefile b/usr.sbin/makemandb/Makefile index 42fcb1ca7a0..3d604f18779 100644 --- a/usr.sbin/makemandb/Makefile +++ b/usr.sbin/makemandb/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2012/10/06 15:33:59 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2013/01/14 18:01:59 christos Exp $ .include <bsd.own.mk> -MDIST= ${NETBSDSRCDIR}/external/bsd/mdocml/dist MDOCDIR=${NETBSDSRCDIR}/external/bsd/mdocml MANCONFDIR=${NETBSDSRCDIR}/usr.bin/man @@ -20,7 +19,7 @@ BINDIR.whatis= /usr/bin .PATH: ${MANCONFDIR} -CPPFLAGS+=-I${MDIST} -I${MANCONFDIR} -I${.OBJDIR} +CPPFLAGS+= -I${MDOCDIR} -I${MANCONFDIR} -I${.OBJDIR} MDOCMLOBJDIR!= cd ${MDOCDIR}/lib/libmandoc && ${PRINTOBJDIR} MDOCMLLIB= ${MDOCMLOBJDIR}/libmandoc.a diff --git a/usr.sbin/makemandb/apropos-utils.c b/usr.sbin/makemandb/apropos-utils.c index 596f4525a9f..0fd2fcbc181 100644 --- a/usr.sbin/makemandb/apropos-utils.c +++ b/usr.sbin/makemandb/apropos-utils.c @@ -1,4 +1,4 @@ -/* $NetBSD: apropos-utils.c,v 1.7 2012/10/06 15:33:59 wiz Exp $ */ +/* $NetBSD: apropos-utils.c,v 1.8 2013/01/14 18:01:59 christos Exp $ */ /*- * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com> * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: apropos-utils.c,v 1.7 2012/10/06 15:33:59 wiz Exp $"); +__RCSID("$NetBSD: apropos-utils.c,v 1.8 2013/01/14 18:01:59 christos Exp $"); #include <sys/queue.h> #include <sys/stat.h> @@ -48,7 +48,7 @@ __RCSID("$NetBSD: apropos-utils.c,v 1.7 2012/10/06 15:33:59 wiz Exp $"); #include "apropos-utils.h" #include "manconf.h" -#include "mandoc.h" +#include "dist/mandoc.h" #include "sqlite3.h" typedef struct orig_callback_data { diff --git a/usr.sbin/makemandb/makemandb.c b/usr.sbin/makemandb/makemandb.c index 9f4388450a4..c491457a02a 100644 --- a/usr.sbin/makemandb/makemandb.c +++ b/usr.sbin/makemandb/makemandb.c @@ -1,4 +1,4 @@ -/* $NetBSD: makemandb.c,v 1.16 2012/11/08 19:17:54 christos Exp $ */ +/* $NetBSD: makemandb.c,v 1.17 2013/01/14 18:01:59 christos Exp $ */ /* * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: makemandb.c,v 1.16 2012/11/08 19:17:54 christos Exp $"); +__RCSID("$NetBSD: makemandb.c,v 1.17 2013/01/14 18:01:59 christos Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -36,9 +36,9 @@ __RCSID("$NetBSD: makemandb.c,v 1.16 2012/11/08 19:17:54 christos Exp $"); #include <util.h> #include "apropos-utils.h" -#include "man.h" -#include "mandoc.h" -#include "mdoc.h" +#include "dist/man.h" +#include "dist/mandoc.h" +#include "dist/mdoc.h" #include "sqlite3.h" #define BUFLEN 1024 |
