Fix i386 build of chpass after r363992

My change to allow bootstrapping pwd_mkdb (r363992) resulted in i386 build
failures because the bootstrap header was being included in non-bootstrap chpass.
Dropping the no longer required pwd_mkdb include path from chpass fixes
the build, but to be certain that the failure doesn't get re-introduced,
I've also moved the bootstrap pwd.h into a subdirectory so that adding
-I${SRCTOP}/usr.sbin/pwd_mkdb doesn't pull it in.

Reported by:	mjg

diff --git a/chpass/Makefile b/chpass/Makefile
index fb70df886ee2d88171d13716d5ca2fceff6a873d..bd5baa3c4d0755f2ac45df682509666c84ad577b 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -3,7 +3,7 @@
 
 .include <src.opts.mk>
 
 
 .include <src.opts.mk>
 

-.PATH: ${SRCTOP}/usr.sbin/pwd_mkdb ${SRCTOP}/lib/libc/gen
+.PATH: ${SRCTOP}/lib/libc/gen

 
 PROG=  chpass
 SRCS=  chpass.c edit.c field.c pw_scan.c table.c util.c
 
 PROG=  chpass
 SRCS=  chpass.c edit.c field.c pw_scan.c table.c util.c


@@ -15,7 +15,7 @@ CFLAGS+= -DYP
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE

-CFLAGS+=-I${SRCTOP}/usr.sbin/pwd_mkdb -I${SRCTOP}/lib/libc/gen -I.
+CFLAGS+=-I${SRCTOP}/lib/libc/gen -I.

 
 LIBADD=        crypt util
 .if ${MK_NIS} != "no"
 
 LIBADD=        crypt util
 .if ${MK_NIS} != "no"