From 0ceb54cf9d946eb698aecb2ebca74a44de4a2747 Mon Sep 17 00:00:00 2001 From: tron Date: Fri, 29 Oct 2004 10:32:54 +0000 Subject: Include makefile fragments from "../../databases/mysql-client" and not ""../../databases/mysql4-client" because the later is a newer version. --- databases/mysql-server/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'databases/mysql-server/Makefile') diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index dac660bf927..c941d2c3795 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2004/10/28 01:08:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.58 2004/10/29 10:32:54 tron Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -6,7 +6,7 @@ COMMENT= MySQL 4, a free SQL database (server) CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} -.include "../mysql4-client/Makefile.common" +.include "../mysql-client/Makefile.common" USE_BUILDLINK3= yes @@ -34,7 +34,7 @@ MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ BUILD_DEFS+= MYSQL_DATADIR BUILD_DIRS= ${WRKSRC} ${WRKSRC}/man -.include "../../databases/mysql4-client/buildlink3.mk" +.include "../../databases/mysql-client/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -- cgit v1.2.3