avr32: compile fix

[openwrt/svn-archive/archive.git] / XOrg / lib / gtk-2.8.20 / Makefile

diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile
index 40c3fd6d3e0c2799012cf2d316c0799641e1a896..bdcf507549e094c07425cf37acac4b9c4d1468ff 100644 (file)
--- a/XOrg/lib/gtk-2.8.20/Makefile
+++ b/XOrg/lib/gtk-2.8.20/Makefile
@@ -27,7 +27,7 @@ define Package/gtk-2.8.20
   CATEGORY:=Xorg
   SUBMENU:=framework
   TITLE:=GTK+ 2.8.20 package
-  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff
+  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff @DISPLAY_SUPPORT
 endef
 
 define Build/Configure
@@ -48,11 +48,13 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR)  $(STAGING_DIR)/usr/{lib/pkgconfig,include}
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*-2.0.la
+       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
 endef
 
 $(eval $(call BuildPackage,gtk-2.8.20))
+$(eval $(call RequireCommand,gdk-pixbuf-csource, \
+       Please install gtk2.0-dev \
+))