summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baker <dbaker@FreeBSD.org>1999-07-23 05:29:55 +0000
committerDaniel Baker <dbaker@FreeBSD.org>1999-07-23 05:29:55 +0000
commit3334445bde9de850f2bf85a6da71714259618d80 (patch)
tree1caa8c6cf8fd3b0134581f9d37752a7eb0780b6c
parentUpdate from b16 to b18, which does contain a FreeBSD fix. (diff)
makefile's check for existance of DISPLAY only checked if the variable
was defined, and didn't not check the possibility of an empty DISPLAY, which was the cause of the packages build error.
Notes
Notes: svn path=/head/; revision=20322
-rw-r--r--x11/xgrab/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 1638f0e75f1c..719bca89cdae 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -3,7 +3,7 @@
# Date created: 27 February 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.12 1998/09/26 23:20:10 steve Exp $
+# $Id: Makefile,v 1.13 1999/07/06 03:57:39 obrien Exp $
#
DISTNAME= xgrabsc.2_41
@@ -20,10 +20,9 @@ MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
# "make depend" blows up
XMKMF= xmkmf
-# Needs to actually *run* xrdb
-#IS_INTERACTIVE= yes
-.if !defined(DISPLAY)
-BROKEN= Requires an active X session to run xrdb. Please compile this while running X.
+
+.if !defined(DISPLAY) || ${DISPLAY} == ""
+BROKEN= "Requires an active X session (and DISPLAY variable) to run xrdb. Please compile this while running X."
.endif
MAN1= xgrab.1 xgrabsc.1