this patch adds the bundled headers to the end of the search path of the makefile includes

0001_hack_makefile_paths.patch (text/plain), 1.00 KB, created by Jamal Natour on 2009-05-03 08:08:34 UTC

--- Makefile.old	2009-05-03 07:56:41.000000000 +0100
+++ Makefile	2009-05-03 08:11:02.000000000 +0100
@@ -34,9 +34,19 @@ ifeq ($(BUILD_MODULAR),y)
   LDCOMBINEFLAGS = -shared -lc
   PICFLAG = $(call check_gcc,-fPIC,)
   X_INCLUDES_ROOT = $(INSTALLED_X)
+
+     # Not all of the files are present, so add the supplied headers onto the 
+     # header search path, we rely on the search order running from left
+     # to right, meaning the system includes should take precedence over locals.
+     X_XTRA_INCLUDE_ROOT := Xincludes/usr/X11R6
+     X_XTRA_INCLUDE_ALL  := 	-I$(X_XTRA_INCLUDE_ROOT)/include/X11 \
+		  		-I$(X_XTRA_INCLUDE_ROOT)/include/X11/extensions \
+		  		-I$(X_XTRA_INCLUDE_ROOT)/$(LIBDIR)/Server/include
+
   ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
 		-I$(INSTALLED_X)/include/X11/extensions \
-		`pkg-config xorg-server --cflags`
+		`pkg-config xorg-server --cflags`	\
+		$(X_XTRA_INCLUDE_ALL)
 else
   INSTALLED_X = /usr/X11R6
   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input