summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-11-04 09:18:57 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-11-05 10:07:26 +0100
commit4411017f86a54c4c8007eaf2458a85dc0510c624 (patch)
treed370b97960dd24a13c2e0091b7e7041315256130
parent89d1ad91fe4b1b65f0e902f94aba99a6cefbf631 (diff)
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>
-rw-r--r--package/gdk-pixbuf/S26gdk-pixbuf (renamed from package/libgtk2/S26libgtk2)2
-rw-r--r--package/gdk-pixbuf/gdk-pixbuf.mk6
-rw-r--r--package/libgtk2/libgtk2.mk1
3 files changed, 7 insertions, 2 deletions
diff --git a/package/libgtk2/S26libgtk2 b/package/gdk-pixbuf/S26gdk-pixbuf
index 037746d96..82b7944e7 100644
--- 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 4c3e108a0..f76209578 100644
--- 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 e41fcc9f9..6e14d275a 100644
--- 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