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 --- converters/php-iconv/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'converters') diff --git a/converters/php-iconv/Makefile b/converters/php-iconv/Makefile index 3efd96c278f..ffafeb9abc6 100644 --- a/converters/php-iconv/Makefile +++ b/converters/php-iconv/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= iconv CATEGORIES+= converters @@ -14,7 +14,6 @@ USE_BUILDLINK3= YES .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.prefs.mk" .include "../../mk/buildlink3/bsd.builtin.mk" -.include "../../lang/php/ext.mk" .if !empty(USE_BUILTIN.iconv:M[nN][oO]) # use libiconv @@ -24,4 +23,5 @@ CONFIGURE_ARGS+= --with-iconv=shared,${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --with-iconv .endif +.include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3