gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/libgtk2/S26libgtk2 b/package/gdk-pixbuf/S26gdk-pixbuf
similarity index 85%
rename from package/libgtk2/S26libgtk2
rename to package/gdk-pixbuf/S26gdk-pixbuf
index 037746d9692039b7735e38bece85956cc4886484..82b7944e744ce3cc72371715ba23c8bbc565ceeb 100644 (file)
--- a/package/libgtk2/S26libgtk2
+++ b/package/gdk-pixbuf/S26gdk-pixbuf
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# run pgdk-pixbuf-query-loaders if needed
+# run gdk-pixbuf-query-loaders if needed
 
 FILE=/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 4c3e108a072059b819d9a6b02c77d6a08ae5cba4..f762095781e881496824d8de9ce7b452051422d8 100644 (file)
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,6 +40,12 @@ endif
 
 GDK_PIXBUF_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 libiconv
 
+define GDK_PIXBUF_POST_INSTALL_TWEAKS
+       $(INSTALL) -m 755 package/gdk-pixbuf/S26gdk-pixbuf $(TARGET_DIR)/etc/init.d/
+endef
+
+GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_POST_INSTALL_TWEAKS
+
 $(eval $(call AUTOTARGETS,package,gdk-pixbuf))
 
 HOST_GDK_PIXBUF_CONF_OPT = \

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index e41fcc9f94af230dfc5434cadd83b25080418117..6e14d275acb3d86eec2fb0362566c0036397d901 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -115,7 +115,6 @@ LIBGTK2_CONF_OPT += --disable-cups
 endif
 
 define LIBGTK2_POST_INSTALL_TWEAKS
-       $(INSTALL) -m 755 package/libgtk2/S26libgtk2 $(TARGET_DIR)/etc/init.d/
        rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo
 endef