diff options
| author | mrauch <mrauch@pkgsrc.org> | 2002-07-31 21:14:04 +0000 |
|---|---|---|
| committer | mrauch <mrauch@pkgsrc.org> | 2002-07-31 21:14:04 +0000 |
| commit | 20a1bea9c458458cf74bf695878c966b3026827d (patch) | |
| tree | f7c7b87337a2991f090e14d3739ec4f53f58214e | |
| parent | ee97dff574a69900e23ccf73c32ae7925cb9dc82 (diff) | |
| download | pkgsrc-20a1bea9c458458cf74bf695878c966b3026827d.tar.gz | |
Move the check, whether X is accessible, inside the "checkforx" target.
This avoids strange side effects (hanging xdpyinfo) when using targets that
do not depend on an accessible X server.
Fixes PR# pkg/17763.
| -rw-r--r-- | misc/openoffice/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index c221d05f225..41bd9e7ac0d 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/07/31 19:33:20 schmonz Exp $ +# $NetBSD: Makefile,v 1.15 2002/07/31 21:14:04 mrauch Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -60,11 +60,8 @@ post-extract: ${WRKSRC}/../sablot/Sablot-0.52.patch DISPLAY?= #empty, if unset -.if ${DISPLAY}!="" -DISPLAY_OK!=${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO -.endif checkforx: -.if ${DISPLAY}=="" || ${DISPLAY_OK} == "NO" +.if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO!} == "NO" .if exists(${X11BASE}/bin/Xvfb) -${X11BASE}/bin/Xvfb :2 & DISPLAY= ':2' |