Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin

[coffee/buildroot.git] / package / libgtk3 / libgtk3.mk

diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index f3b1705d9811e242b49b4ca415d55ab5886b14d1..b4a8b8c51773419758924cbb72eaffcbdf9604de 100644 (file)
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -14,9 +14,9 @@ LIBGTK3_INSTALL_STAGING = YES
 LIBGTK3_AUTORECONF = YES
 
 LIBGTK3_CONF_ENV = \
-       ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
-       ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
-       PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/usr/bin/pkgconf
+       ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \
+       ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \
+       PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf
 
 LIBGTK3_CONF_OPTS = \
        --disable-glibtest \
@@ -123,7 +123,7 @@ LIBGTK3_CONF_OPTS += --disable-installed-tests
 endif
 
 define LIBGTK3_COMPILE_GLIB_SCHEMAS
-       $(HOST_DIR)/usr/bin/glib-compile-schemas \
+       $(HOST_DIR)/bin/glib-compile-schemas \
                $(TARGET_DIR)/usr/share/glib-2.0/schemas
 endef
 
@@ -151,8 +151,8 @@ HOST_LIBGTK3_DEPENDENCIES = \
        host-librsvg
 
 HOST_LIBGTK3_CFLAGS = \
-       `$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
-       `$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gio-2.0`
+       `$(HOST_DIR)/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
+       `$(HOST_DIR)/bin/pkgconf --cflags --libs gio-2.0`
 
 define HOST_LIBGTK3_CONFIGURE_CMDS
        echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
@@ -173,16 +173,16 @@ endef
 
 define HOST_LIBGTK3_INSTALL_CMDS
        $(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \
-               $(HOST_DIR)/usr/bin/gtk-update-icon-cache
+               $(HOST_DIR)/bin/gtk-update-icon-cache
        $(INSTALL) -D -m 0755 $(@D)/gtk/gtk-encode-symbolic-svg \
-               $(HOST_DIR)/usr/bin/gtk-encode-symbolic-svg
+               $(HOST_DIR)/bin/gtk-encode-symbolic-svg
 endef
 
 # Create icon-theme.cache for each of the icon directories/themes
 # It's not strictly necessary but speeds up lookups
 define LIBGTK3_UPDATE_ICON_CACHE
        find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
-               -exec $(HOST_DIR)/usr/bin/gtk-update-icon-cache {} \;
+               -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
 endef
 LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE