diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-02 22:02:33 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-02 22:02:33 +0000 |
| commit | 011e498021988a5f490c71b3994c7d9b01a2efb2 (patch) | |
| tree | 349605caaa130147e8477777f96df01fa9503d03 | |
| parent | c2d7e26fd73c564384da5185e1c2ed2be8a4da07 (diff) | |
| download | pkgsrc-011e498021988a5f490c71b3994c7d9b01a2efb2.tar.gz | |
Include options.mk in -client and -server, but not the common
Makefile.
| -rw-r--r-- | databases/openldap-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap/Makefile.common | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile index f83dba79aa2..2c894d0c738 100644 --- a/databases/openldap-client/Makefile +++ b/databases/openldap-client/Makefile @@ -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" diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index bf89d3cca52..28aa622149f 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -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} diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common index 7a8bb7be9be..245c3b6ac71 100644 --- a/databases/openldap/Makefile.common +++ b/databases/openldap/Makefile.common @@ -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" |