X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Flib%2Fgtk2%2FMakefile;h=bdbfc4b09833b87730c9b82eb6c7c515e24118c6;hp=f03bf7c71475afff83602381534ad25199a21617;hb=8397574f9b50910aa7ce3b2638bf9d8aeea2c6d0;hpb=fd32a49f2c33990d4ea0725fc6884502ae956de8

diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index f03bf7c714..bdbfc4b098 100644
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gtk2
 PKG_VERSION:=2.14.4
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/gtk+/2.14
@@ -31,7 +31,7 @@ EXTRA_LDFLAGS+=\
 	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
 	-L$(STAGING_DIR)/usr/lib/
 
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk-cups2)
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)
 
 define Package/gtk2
   SECTION:=xorg-framework
@@ -60,7 +60,7 @@ define Build/Configure
 		--disable-xinerama \
 		--without-libjasper \
 		--with-xinput \
-		$(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups,--disable-cups), \
+		$(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \
 		gio_can_sniff=no \
 	)
 endef
@@ -70,7 +70,7 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
 
-	$(INSTALL_DATA) \
+	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
 		$(1)/usr/lib/
 
@@ -86,7 +86,7 @@ define Package/gtk2/install
 		$(1)/etc/gtk-2.0/
 
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) \
+	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
 		$(1)/usr/lib/