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

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

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index f566fc7d5ea783af35d9bf70ce48ccca8aa36202..7110e39083af7f41d16abae31c51436bac344fd9 100644 (file)
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-GVFS_VERSION_MAJOR = 1.26
+GVFS_VERSION_MAJOR = 1.30
 GVFS_VERSION = $(GVFS_VERSION_MAJOR).3
 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
-GVFS_LICENSE = LGPLv2+
+GVFS_LICENSE = LGPL-2.0+
 GVFS_LICENSE_FILES = COPYING
 
 # Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
@@ -20,6 +20,7 @@ GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-con
 # Most of these are missing library support
 GVFS_CONF_OPTS = \
        --disable-afc \
+       --disable-admin \
        --disable-bash-completion \
        --disable-cdda \
        --disable-gconf \
@@ -127,12 +128,12 @@ define GVFS_REMOVE_TARGET_SCHEMAS
 endef
 
 define GVFS_COMPILE_SCHEMAS
-       $(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
+       $(HOST_DIR)/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
 endef
 
 GVFS_POST_INSTALL_TARGET_HOOKS += \
-       GVFS_REMOVE_USELESS_BINARY      \
-       GVFS_REMOVE_TARGET_SCHEMAS      \
+       GVFS_REMOVE_USELESS_BINARY \
+       GVFS_REMOVE_TARGET_SCHEMAS \
        GVFS_COMPILE_SCHEMAS
 
 $(eval $(autotools-package))