Include options.mk in -client and -server, but not the common

Makefile.
This commit is contained in:
joerg 2006-06-02 22:02:33 +00:00
parent f2d9a1c52f
commit d5d04d0385
3 changed files with 7 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2006/05/31 18:18:34 ghen Exp $
# $NetBSD: Makefile,v 1.2 2006/06/02 22:02:33 joerg Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
COMMENT= Lightweight Directory Access Protocol libraries and client programs
@ -16,5 +16,7 @@ BUILD_DEFS+= OPENLDAP_ETCDIR
CNFS= ldap.conf
.include "options.mk"
.include "../../databases/openldap/Makefile.common"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2006/05/31 18:18:36 ghen Exp $
# $NetBSD: Makefile,v 1.2 2006/06/02 22:02:33 joerg Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= Lightweight Directory Access Protocol server suite
@ -70,6 +70,8 @@ MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
MESSAGE_SUBST+= CHOWN=${CHOWN}
MESSAGE_SUBST+= CHMOD=${CHMOD}
.include "options.mk"
.include "../../databases/openldap/Makefile.common"
CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.1 2006/05/31 18:17:49 ghen Exp $
# $NetBSD: Makefile.common,v 1.2 2006/06/02 22:02:33 joerg Exp $
DISTNAME= openldap-2.3.23
CATEGORIES= databases
@ -31,8 +31,6 @@ SLAPD_USER?= slapd
SLURPD_USER?= slurpd
LDAP_GROUP?= ldap
.include "${.CURDIR}/options.mk"
# the internal avl_* prototypes conflict with those in <sys/avl.h> which
# is included by another system header file on Solaris, so subst them.
.if ${OPSYS} == "SunOS"