From 4fdb70ce2b6a154fab737325ef9b83945cd7bbc9 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Fri, 5 Nov 2004 17:11:39 +0000 Subject: now that PHP 5.x Makefile.common doesn't pollute CONFIGURE_ARGS, it safe to include "../../lang/php/ext.mk" after extension CONFIGURE_ARGS setting; successful build confirmed with both PHP 4.x and PHP 5.x --- archivers/php-bz2/Makefile | 5 ++--- archivers/php-zlib/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'archivers') diff --git a/archivers/php-bz2/Makefile b/archivers/php-bz2/Makefile index f9a816258cc..58615fe1daa 100644 --- a/archivers/php-bz2/Makefile +++ b/archivers/php-bz2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $ +# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $ MODNAME= bz2 CATEGORIES+= archivers @@ -7,9 +7,8 @@ COMMENT= PHP extension for bzip2 compression USE_BUILDLINK3= YES -.include "../../lang/php/ext.mk" - CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.bzip2} +.include "../../lang/php/ext.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/php-zlib/Makefile b/archivers/php-zlib/Makefile index a005a2cd7e2..cb5575f5376 100644 --- a/archivers/php-zlib/Makefile +++ b/archivers/php-zlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/10/31 21:07:13 jdolecek Exp $ +# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:39 jdolecek Exp $ MODNAME= zlib CATEGORIES+= archivers @@ -7,12 +7,11 @@ COMMENT= PHP extension for zlib compression USE_BUILDLINK3= YES -.include "../../lang/php/ext.mk" - CONFIGURE_ARGS+= --with-${MODNAME}-dir=${BUILDLINK_DIR} post-extract: cd ${WRKSRC}; ${RM} -f config.m4; ${LN} -sf config0.m4 config.m4 +.include "../../lang/php/ext.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3