Module Name: src
Committed By: christos
Date: Mon Jan 14 18:01:59 UTC 2013
Modified Files:
src/usr.sbin/makemandb: Makefile apropos-utils.c makemandb.c
Log Message:
Since mdocml decided to name headers that conflict with system ones (term.h)
move the header inclusion one up.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makemandb/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makemandb/makemandb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makemandb/Makefile
diff -u src/usr.sbin/makemandb/Makefile:1.3 src/usr.sbin/makemandb/Makefile:1.4
--- src/usr.sbin/makemandb/Makefile:1.3 Sat Oct 6 11:33:59 2012
+++ src/usr.sbin/makemandb/Makefile Mon Jan 14 13:01:59 2013
@@ -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
Index: src/usr.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.7 src/usr.sbin/makemandb/apropos-utils.c:1.8
--- src/usr.sbin/makemandb/apropos-utils.c:1.7 Sat Oct 6 11:33:59 2012
+++ src/usr.sbin/makemandb/apropos-utils.c Mon Jan 14 13:01:59 2013
@@ -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 <[email protected]>
* 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
#include "apropos-utils.h"
#include "manconf.h"
-#include "mandoc.h"
+#include "dist/mandoc.h"
#include "sqlite3.h"
typedef struct orig_callback_data {
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.16 src/usr.sbin/makemandb/makemandb.c:1.17
--- src/usr.sbin/makemandb/makemandb.c:1.16 Thu Nov 8 14:17:54 2012
+++ src/usr.sbin/makemandb/makemandb.c Mon Jan 14 13:01:59 2013
@@ -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 <[email protected]>
* Copyright (c) 2011 Kristaps Dzonsons <[email protected]>
@@ -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 201
#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
