From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 21 Feb 2010 21:02:40 +0000 (+0000)
Subject: [packages] imlib2: Pass Xorg include and libarary path. Otherwise it will look
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=4273f5522f18304970f3deda8c2a402d139c8ce0;p=packages.git

[packages] imlib2: Pass Xorg include and libarary path. Otherwise it will look
for it for them in the host environment.


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

diff --git a/Xorg/lib/imlib2/Makefile b/Xorg/lib/imlib2/Makefile
index 607ee537a..87e55b8c6 100644
--- a/Xorg/lib/imlib2/Makefile
+++ b/Xorg/lib/imlib2/Makefile
@@ -30,7 +30,15 @@ define Package/imlib2
   DEPENDS:=+libX11 +giflib +libtiff +libjpeg +gtk1 +libfreetype +libXext
 endef
 
-CONFIGURE_ARGS+=--disable-gtktest LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+TARGET_CFLAGS += "-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--x-includes="$(STAGING_DIR)/usr/include/X11" \
+		--x-libraries="$(STAGING_DIR)/usr/lib/" \
+		--disable-gtktest \
+	)
+endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig}