diff options
| author | jdolecek <jdolecek> | 2002-08-02 15:13:47 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2002-08-02 15:13:47 +0000 |
| commit | e2cad53d52e9e4521a11f4afd767c64c27d8148c (patch) | |
| tree | 230c3f8a9f6a6f8f504622bb8c9d7db3300d2cd8 /misc/openoffice | |
| parent | 61d421cfeaab3a0691fb827f9677248ceddcfe0f (diff) | |
| download | pkgsrc-e2cad53d52e9e4521a11f4afd767c64c27d8148c.tar.gz | |
.include bsd.prefs.mk before checkforx: target, so that X11BASE gets defined
and the condition has chance of working properly
quote the value if display in do-build: target, just in case
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 98099bb39a3..4287bd64531 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/08/01 05:48:17 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/02 15:13:47 jdolecek Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 1 @@ -54,6 +54,8 @@ post-extract: ${PERL5} -p -i.save -e 's/\r\n/\n/' \ ${WRKSRC}/../sablot/Sablot-0.52.patch +.include "../../mk/bsd.prefs.mk" + DISPLAY?= #empty, if unset checkforx: .if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && echo YES || echo NO!} == "NO" @@ -70,7 +72,7 @@ DISPLAY= ':2' pre-build: checkforx do-build: - tcsh -c "setenv DISPLAY ${DISPLAY}; cd ${WRKSRC}/..&& \ + tcsh -c "setenv DISPLAY '${DISPLAY}'; cd ${WRKSRC}/..&& \ ./bootstrap&& source *.Set&& dmake" pre-install: checkforx |