diff options
| author | jdolecek <jdolecek> | 2003-09-27 13:25:39 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2003-09-27 13:25:39 +0000 |
| commit | 2f0c2c42a1852d8cc41e555b095f927c17d40d49 (patch) | |
| tree | 163a2d02721816423d3bfd3fe4cb843d4ea84511 /databases | |
| parent | 6c1263cde1b6ce943484db6de6484d46b39981fd (diff) | |
| download | pkgsrc-2f0c2c42a1852d8cc41e555b095f927c17d40d49.tar.gz | |
merge back into single Makefile
discussed with Thomas Klausner and Michal Pasternak
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/php4-mysql/Makefile | 13 | ||||
| -rw-r--r-- | databases/php4-mysql/Makefile.common | 13 |
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 |