diff options
| author | tron <tron@pkgsrc.org> | 2001-07-06 21:10:20 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-07-06 21:10:20 +0000 |
| commit | 8f157753f25762689604067b93b438b2f4eac7ff (patch) | |
| tree | bc1d6288811f88d0811ab575a804d8c3a52886b7 /mk | |
| parent | b55d5a9f0b5133ae2e968d1ef996631c65793b34 (diff) | |
| download | pkgsrc-8f157753f25762689604067b93b438b2f4eac7ff.tar.gz | |
Check if "${X11BASE}/lib/X11/config/X11.tmpl" before searching with
"grep" in it to avoid problems under Solaris.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 65aab1ce7ed..d712935521f 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.48 2001/07/05 21:11:07 abs Exp $ +# $NetBSD: bsd.prefs.mk,v 1.49 2001/07/06 21:10:20 tron Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -200,7 +200,8 @@ HAVE_BUILTIN_FREETYPE2= YES # depend on the Xpm package. .if (defined(CHECK_XPM) || defined(USE_XPM)) X11BASE?= /usr/X11R6 -.if exists(${X11BASE}/include/X11/xpm.h) +.if exists(${X11BASE}/include/X11/xpm.h) && \ + exist(${X11BASE}/lib/X11/config/X11.tmpl __BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} .else __BUILTIN_XPM= 0 |