From 2b5da25de3c111d9aa3fda9cb18a58fd3ab2d2d7 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 23 Nov 2004 20:17:55 +0000 Subject: buildlink3.mk files should be included outside of the multiple inclusion protected region (see mk/buildlink3/bsd.buildlink.mk). --- www/apache2/buildlink3.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/apache2') diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index bb4c4fd963f..5f569079fff 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:18:24 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 20:17:55 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -23,12 +23,12 @@ BUILDLINK_DEPMETHOD.apache+= full USE_PERL5?= build # for "apxs" APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs -.include "../../devel/apr/buildlink3.mk" - .if !empty(APACHE_BUILDLINK3_MK:M+) . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2="${APXS}" . endif .endif # APACHE_BUILDLINK3_MK +.include "../../devel/apr/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3