From 415d6f39587f62d4f02f7d31ff45aad4fd8f1e1e Mon Sep 17 00:00:00 2001 From: ade Date: Thu, 23 Feb 2006 10:43:00 +0000 Subject: Only include bsd.autotools.mk if USE_AUTOTOOLS is defined. Tested as part of the single-libtool patch. Approved by: portmgr (kris) --- Mk/bsd.port.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d8cc2c6f7547..079c7b625abd 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1816,10 +1816,9 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif -# XXX -#.if defined(USE_AUTOTOOLS) +.if defined(USE_AUTOTOOLS) .include "${PORTSDIR}/Mk/bsd.autotools.mk" -#.endif +.endif .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" @@ -3301,11 +3300,10 @@ do-patch: fi .endif -# XXX - To be tested later -#.if !target(run-autotools) && !defined(USE_AUTOTOOLS) -#run-autotools: -# ${DO_NADA} -#.endif +.if !target(run-autotools) +run-autotools: + ${DO_NADA} +.endif # Configure -- cgit