diff options
| author | joerg <joerg> | 2013-03-28 21:40:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-03-28 21:40:50 +0000 |
| commit | 18da8adfc72b5302332e2f8c3d71261df50186cd (patch) | |
| tree | e55a85e5b3070930584cf726832bc94a49a4f7bd /www | |
| parent | 14f42b5995264f2a2d64cbab96ccbde2fb5a5a86 (diff) | |
| download | pkgsrc-18da8adfc72b5302332e2f8c3d71261df50186cd.tar.gz | |
Newer MySQL has moved to PREFIX/lib. Adjust.
Diffstat (limited to 'www')
| -rw-r--r-- | www/ap-auth-mysql/Makefile | 9 | ||||
| -rw-r--r-- | www/ap2-auth-mysql/Makefile | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile index 6efea82a563..b395578877a 100644 --- a/www/ap-auth-mysql/Makefile +++ b/www/ap-auth-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/03/02 20:33:33 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2013/03/28 21:40:50 joerg Exp $ # DISTNAME= mod-auth-mysql_4.3.9.orig @@ -19,10 +19,9 @@ CONFLICTS= ap-auth-mysql-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \ - --with-mysql-libs=${BUILDLINK_PREFIX.mysql-client}/lib/mysql -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql - +CONFIGURE_ARGS+= --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client} \ + --with-mysql-libs=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/${BUILDLINK_LIBDIRS.mysql-client} WRKSRC= ${WRKDIR}/${DISTNAME:S/.orig//:S/_/-/} diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile index 630232ed89a..6b36a2f37f6 100644 --- a/www/ap2-auth-mysql/Makefile +++ b/www/ap2-auth-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/03/02 20:33:33 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2013/03/28 21:40:50 joerg Exp $ # DISTNAME= mod_auth_mysql.c @@ -36,8 +36,8 @@ do-build: cd ${WRKSRC} && \ ${APXS} -c -n ${APACHE_MODULE_NAME} \ -I${BUILDLINK_PREFIX.mysql-client}/include \ - -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \ + -L${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client} \ -lmysqlclient ${DISTNAME} do-install: |