summaryrefslogtreecommitdiffstats
path: root/chpass/Makefile
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2020-08-08 10:05:27 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2020-08-08 10:05:27 +0000
commitbd97bd394db403e3bfef3cfcede416d81f93b349 (patch)
tree1fec5a805392988abb1472683a6ac51450642c0a /chpass/Makefile
parent181546cc6f3a31193f3c424e0c0d322ebe7b3840 (diff)
downloadpw-darwin-bd97bd394db403e3bfef3cfcede416d81f93b349.tar.gz
pw-darwin-bd97bd394db403e3bfef3cfcede416d81f93b349.tar.zst
pw-darwin-bd97bd394db403e3bfef3cfcede416d81f93b349.zip
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
Diffstat (limited to 'chpass/Makefile')
-rw-r--r--chpass/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/chpass/Makefile b/chpass/Makefile
index fb70df8..bd5baa3 100644
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -3,7 +3,7 @@
.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
@@ -15,7 +15,7 @@ CFLAGS+= -DYP
.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"