diff options
| -rw-r--r-- | databases/php-mysql/Makefile | 3 | ||||
| -rw-r--r-- | databases/py-gdbm/Makefile | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile index 679c99faa57..b21c0ef8023 100644 --- a/databases/php-mysql/Makefile +++ b/databases/php-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2015/08/10 14:19:11 manu Exp $ +# $NetBSD: Makefile,v 1.22 2015/11/25 12:49:27 jperkin Exp $ MODNAME= mysql CATEGORIES+= databases @@ -19,7 +19,6 @@ PKG_SUGGESTED_OPTIONS= # empty .if !empty(PKG_OPTIONS:Mmysqlnd) CONFIGURE_ARGS+= --with-${MODNAME}=shared,mysqlnd .else -EVAL_PREFIX+= MYSQLDIR=mysql-client CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.mysql-client} LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql . include "../../mk/mysql.buildlink3.mk" diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 476b534e809..e7606910aee 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2014/12/21 01:22:33 obache Exp $ +# $NetBSD: Makefile,v 1.35 2015/11/25 12:49:27 jperkin Exp $ PKGNAME= ${PYPKGPREFIX}-gdbm-${PY_DISTVERSION} CATEGORIES= databases python @@ -7,8 +7,6 @@ MAINTAINER= dolecek@ics.muni.cz HOMEPAGE= http://www.python.org/doc/lib/module-gdbm.html COMMENT= Python interface to gdbm - GNU database manager -EVAL_PREFIX+= GDBMDIR=gdbm - USE_TOOLS+= patch .include "../../lang/python/pyversion.mk" @@ -22,7 +20,7 @@ EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/${GDBM_MODNAME}module.c PYDISTUTILSPKG= yes PY_PATCHPLIST= yes -PY_SETUP_SUBST+= GDBMPREFIX=${GDBMDIR} +PY_SETUP_SUBST+= GDBMPREFIX=${BUILDLINK_PREFIX.gdbm} PY_SETUP_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} PLIST_SUBST+= GDBM_MODNAME=${GDBM_MODNAME} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload |