Move including options.mk to Makefile.common, the plugins do a full build

so need to build it the same way as the main package.  Fixes SSL build.
This commit is contained in:
jperkin 2017-05-15 12:31:10 +00:00
parent e2fe89240f
commit adc72c61be
2 changed files with 4 additions and 4 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.93 2016/11/12 11:21:45 adam Exp $
# $NetBSD: Makefile,v 1.94 2017/05/15 12:31:10 jperkin Exp $
.include "../../mail/dovecot2/Makefile.common"
@ -38,8 +38,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
.include "options.mk"
# Don't compress manual pages as they include each other.
.undef MANZ

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.7 2017/04/19 09:05:16 jperkin Exp $
# $NetBSD: Makefile.common,v 1.8 2017/05/15 12:31:10 jperkin Exp $
#
# when updating to a new release, update ABI depends in
# the buildlink3.mk file as well, since the plugins' version
@ -47,6 +47,8 @@ CONFIGURE_ARGS.SunOS+= --with-notify=none
# mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory
MAKE_JOBS_SAFE= no
.include "options.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/lz4/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"