Mesa (master): glapi: Make xserver location error more helpful

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 1 14:31:17 UTC 2011


Module: Mesa
Branch: master
Commit: f3652f0983e6469a515bdfad439286a1060fa545
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3652f0983e6469a515bdfad439286a1060fa545

Author: Nathan Kidd <nkidd at opentext.com>
Date:   Wed Jun  1 08:29:26 2011 -0600

glapi: Make xserver location error more helpful

glx code hasn't lived under xserver/GL for a long time now.

Signed-off-by: Nathan Kidd <nkidd at opentext.com>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/mapi/glapi/gen/Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 87b928c..c3829dc 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -128,7 +128,10 @@ xorg: check-xorg-source $(XORG_OUTPUTS)
 
 check-xorg-source:
 	@if ! test -d $(XORG_GLX_DIR); then \
-		echo "ERROR: Must specify path to xserver/GL/ checkout; set XORG_BASE env var."; \
+		echo "ERROR: Must specify path to xserver/ checkout. Set XORG_BASE env var."; \
+		if test x$(XORG_BASE) != x; then \
+			echo "'$(XORG_GLX_DIR)' does not exist."; \
+		fi; \
 		exit 1; \
 	fi
 




More information about the mesa-commit mailing list