[src/trunk]: src/usr.sbin/makemandb Since mdocml decided to name headers that...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41ccedda85ea
branches:  trunk
changeset: 784002:41ccedda85ea
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 14 18:01:59 2013 +0000

description:
Since mdocml decided to name headers that conflict with system ones (term.h)
move the header inclusion one up.

diffstat:

 usr.sbin/makemandb/Makefile        |   5 ++---
 usr.sbin/makemandb/apropos-utils.c |   6 +++---
 usr.sbin/makemandb/makemandb.c     |  10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (80 lines):

diff -r 75084fc71c63 -r 41ccedda85ea usr.sbin/makemandb/Makefile
--- a/usr.sbin/makemandb/Makefile       Mon Jan 14 16:52:35 2013 +0000
+++ b/usr.sbin/makemandb/Makefile       Mon Jan 14 18:01:59 2013 +0000
@@ -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 @@
 
 .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 -r 75084fc71c63 -r 41ccedda85ea usr.sbin/makemandb/apropos-utils.c
--- a/usr.sbin/makemandb/apropos-utils.c        Mon Jan 14 16:52:35 2013 +0000
+++ b/usr.sbin/makemandb/apropos-utils.c        Mon Jan 14 18:01:59 2013 +0000
@@ -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@localhost>
  * 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 @@
 
 #include "apropos-utils.h"
 #include "manconf.h"
-#include "mandoc.h"
+#include "dist/mandoc.h"
 #include "sqlite3.h"
 
 typedef struct orig_callback_data {
diff -r 75084fc71c63 -r 41ccedda85ea usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Mon Jan 14 16:52:35 2013 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Mon Jan 14 18:01:59 2013 +0000
@@ -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@localhost>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
@@ -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 @@
 #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