From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Sep 2007 21:02:51 +0000 (+0000)
Subject: fixed compilation of XOrg ati video driver
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=851f1c148609c45cd2cbb7681768154495587c7a;p=packages.git

fixed compilation of XOrg ati video driver

git-svn-id: svn://svn.openwrt.org/openwrt/packages@8958 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/XOrg/driver/common.mk b/XOrg/driver/common.mk
index 110dc4418..5ded67518 100644
--- a/XOrg/driver/common.mk
+++ b/XOrg/driver/common.mk
@@ -12,23 +12,31 @@ _CATEGORY:=driver
 _DEPEND+=+xorg-server-X11R7.2
 include ../../common.mk
 
-EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/xorg -I${STAGING_DIR}/usr/include/X11/
+EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
+		-I$(STAGING_DIR)/usr/include/X11/ \
+		-I$(STAGING_DIR)/usr/include/ \
+		-I$(STAGING_DIR)/include/
 
-CONFIGURE_VARS+=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/"
+EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)
 
 acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1))))
 
-CONFIGURE_VARS += $(foreach a,dri.h sarea.h dristruct.h exa.h,ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes) \
-		ac_cv_file__usr_share_sgml_X11_defs_ent=yes
+CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \
+	sdkdir=$(STAGING_DIR) 
+	#i\
+	#ac_cv_header_exa_h=yes
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
 	if [ -x $(CONFIGURE_CMD) ]; then \
 		$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+		$(foreach a,dri.h sarea.h dristruct.h exa.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \
+		sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\
 		$(CONFIGURE_VARS) \
 		$(CONFIGURE_CMD) \
 		$(CONFIGURE_ARGS_XTRA) \
-		$(CONFIGURE_ARGS) ;\
+		$(CONFIGURE_ARGS) \
+		CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\
 	fi \
 	)
 endef