From: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed, 21 May 2008 17:55:49 +0000 (-0700)
Subject: Follow along GL/glx -> glx renaming in xserver
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e57f1b702e9e38e78fc0e0be7b968d7ae4939c4d;p=mesa.git

Follow along GL/glx -> glx renaming in xserver

The xserver glx modules were lifted up to the top level, so this changes
the glapi generation to look in the new location.
---

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 8098f1b3140..adc53d92494 100644
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -20,7 +20,7 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
 	../../glx/x11/indirect_size.c
 
 
-GLX_DIR = $(XORG_BASE)/GL/glx
+GLX_DIR = $(XORG_BASE)/glx
 
 SERVER_GLAPI_FILES = \
 	$(GLX_DIR)/glapi.h \
@@ -55,7 +55,7 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 all: check-xorg-source $(OUTPUTS) $(SERVER_OUTPUTS)
 
 check-xorg-source:
-	@if ! test -d $(XORG_BASE)/GL/glx; then \
+	@if ! test -d $(GLX_DIR); then \
 		echo "ERROR: Must specify path to xserver checkout; set XORG_BASE."; \
 		exit 1; \
 	fi