7 files changed, 29 insertions, 19 deletions

diff --git a/lib/libc/db/Makefile.inc b/lib/libc/db/Makefile.inc
index 77af9c5123f5..518205cd2a1c 100644
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@@ -1,10 +1,11 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 2/21/94
+#	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
+#	$Id$
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE
 
-.include "${.CURDIR}/db/btree/Makefile.inc"
-.include "${.CURDIR}/db/db/Makefile.inc"
-.include "${.CURDIR}/db/hash/Makefile.inc"
-.include "${.CURDIR}/db/man/Makefile.inc"
-.include "${.CURDIR}/db/mpool/Makefile.inc"
-.include "${.CURDIR}/db/recno/Makefile.inc"
+.include "${.CURDIR}/../libc/db/btree/Makefile.inc"
+.include "${.CURDIR}/../libc/db/db/Makefile.inc"
+.include "${.CURDIR}/../libc/db/hash/Makefile.inc"
+.include "${.CURDIR}/../libc/db/man/Makefile.inc"
+.include "${.CURDIR}/../libc/db/mpool/Makefile.inc"
+.include "${.CURDIR}/../libc/db/recno/Makefile.inc"
diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc
index 8ed76494aabf..f373a214761d 100644
--- a/lib/libc/db/btree/Makefile.inc
+++ b/lib/libc/db/btree/Makefile.inc
@@ -1,6 +1,7 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 7/14/94
+#	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
+#	$Id$
 
-.PATH: ${.CURDIR}/db/btree
+.PATH: ${.CURDIR}/../libc/db/btree
 
 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc
index 59478ba198aa..a10f0fc32eaa 100644
--- a/lib/libc/db/db/Makefile.inc
+++ b/lib/libc/db/db/Makefile.inc
@@ -1,5 +1,6 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$
 
-.PATH: ${.CURDIR}/db/db
+.PATH: ${.CURDIR}/../libc/db/db
 
 SRCS+=	db.c
diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc
index cac96feb02da..080a1a2f4c06 100644
--- a/lib/libc/db/hash/Makefile.inc
+++ b/lib/libc/db/hash/Makefile.inc
@@ -1,6 +1,7 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$
 
-.PATH: ${.CURDIR}/db/hash
+.PATH: ${.CURDIR}/../libc/db/hash
 
 SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 	hash_page.c hsearch.c ndbm.c
diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc
index f55b9f4eeb43..a1474b1ec66a 100644
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@@ -1,8 +1,12 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	#Id$
 
-.PATH: ${.CURDIR}/db/man
+.PATH: ${.CURDIR}/../libc/db/man
 
+# Only build man pages with libc.
+.if ${LIB} == "c"
 # mpool.3
 MAN3+=	db/man/btree.3 db/man/dbopen.3 db/man/hash.3 db/man/recno.3
 MAN3+=	db/man/mpool.3
 MLINKS+= dbopen.3 db.3
+.endif
diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc
index 93210c89e2e5..c8f2949a5523 100644
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@@ -1,5 +1,6 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$
 
-.PATH: ${.CURDIR}/db/mpool
+.PATH: ${.CURDIR}/../libc/db/mpool
 
 SRCS+=	mpool.c
diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc
index e49e22552207..5241fa53c934 100644
--- a/lib/libc/db/recno/Makefile.inc
+++ b/lib/libc/db/recno/Makefile.inc
@@ -1,6 +1,7 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$
 
-.PATH: ${.CURDIR}/db/recno
+.PATH: ${.CURDIR}/../libc/db/recno
 
 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c