summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjdolecek <jdolecek@pkgsrc.org>2003-09-27 13:25:39 +0000
committerjdolecek <jdolecek@pkgsrc.org>2003-09-27 13:25:39 +0000
commit896b41bf7abb0bef3a074f4c7b8f44c1010810cf (patch)
tree163a2d02721816423d3bfd3fe4cb843d4ea84511 /databases
parentc6f2b73a205875d335149925815373c1aac96e50 (diff)
downloadpkgsrc-896b41bf7abb0bef3a074f4c7b8f44c1010810cf.tar.gz
merge back into single Makefile
discussed with Thomas Klausner and Michal Pasternak
Diffstat (limited to 'databases')
-rw-r--r--databases/php4-mysql/Makefile13
-rw-r--r--databases/php4-mysql/Makefile.common13
2 files changed, 11 insertions, 15 deletions
diff --git a/databases/php4-mysql/Makefile b/databases/php4-mysql/Makefile
index 503e7c99c46..24d3c7787f4 100644
--- a/databases/php4-mysql/Makefile
+++ b/databases/php4-mysql/Makefile
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2003/09/25 06:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 13:25:39 jdolecek Exp $
MODNAME= mysql
+CATEGORIES+= databases
+PKGREVISION= # empty
+COMMENT= PHP4 extension for MySQL databases
-.include "../../databases/php4-mysql/Makefile.common"
.include "../../www/php4/Makefile.module"
+
+USE_BUILDLINK2= # defined
+
+EVAL_PREFIX+= MYSQLDIR=mysql-client
+CONFIGURE_ARGS+= --with-${MODNAME}=shared,${MYSQLDIR}
+LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
+
.include "../../databases/mysql-client/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php4-mysql/Makefile.common b/databases/php4-mysql/Makefile.common
deleted file mode 100644
index e39bafe54fe..00000000000
--- a/databases/php4-mysql/Makefile.common
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2003/09/25 06:22:11 wiz Exp $
-
-PKGMODNAME= mysql
-CATEGORIES+= databases
-PKGREVISION?= # empty
-
-COMMENT?= PHP4 extension for MySQL databases
-
-USE_BUILDLINK2?= # defined
-
-EVAL_PREFIX+= MYSQLDIR=mysql-client
-CONFIGURE_ARGS+= --with-${MODNAME}=shared,${MYSQLDIR}
-LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql