diff options
| author | tron <tron> | 2000-11-20 09:33:39 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-20 09:33:39 +0000 |
| commit | 18d48d79d9c2eb396e2ddf9f0df7950e51400927 (patch) | |
| tree | 08b39b70a125ea08483b0a0017fae758a0393434 /mk | |
| parent | d342d1c1afcc1f75f8cb38d30c3472357b905e90 (diff) | |
| download | pkgsrc-18d48d79d9c2eb396e2ddf9f0df7950e51400927.tar.gz | |
Rename ""__BUILTIN_XPM" to "IS_BUILTIN_XPM" and add it to "MAKEFLAGS" to
avoid expensive evaluation in recursive "make" calls as suggested by
Hubert Feyrer.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 42d7162e2fb..d5892438c1b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.612 2000/11/20 09:02:25 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.613 2000/11/20 09:33:39 tron Exp $ # # This file is in the public domain. # @@ -779,18 +779,20 @@ DEPENDS+= ${LESSTIF_DEPENDS} # need to use the package. .if defined(USE_XPM) || (${DISTNAME:Mxpm-*} != "") .if exists(${X11BASE}/include/X11/xpm.h) -__BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.if !defined(IS_BUILTIN_XPM) +IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +MAKEFLAGS+= IS_BUILTIN_XPM=${IS_BUILTIN_XPM} +.endif .if defined(USE_XPM) -.if (${__BUILTIN_XPM} == "0") +.if (${IS_BUILTIN_XPM} == "0") DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} .else XPMDIR_DEFAULT= ${X11BASE} .endif -.elif (${__BUILTIN_XPM} != "0") +.elif (${IS_BUILTIN_XPM} != "0") IGNORE= "The Xpm library is included in your X11 distribution." .endif -.undef __BUILTIN_XPM .else DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} |