From 4a984a8d60f167db87dac6a6c283e62aca692d5e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 10 Jan 2017 15:02:50 +0100 Subject: treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely on it. See 73b7f55424de52d8179a9ad808252fe3bf8dcc9d for more information on STAGING_DIR_HOSTPKG. STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release (it is equivalent to $(STAGING_DIR)/host), so this simple search/replace cleanup is safe to apply. Doing this cleanup now will be useful for the Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream. Also fixes a typo in the dbus Makefile ("STAGIND_DIR"). Signed-off-by: Matthias Schiffer --- libs/glib2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/glib2') diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 013e23b16..48166e8fa 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -61,7 +61,7 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ glib_cv_stack_grows=no \ glib_cv_uscore=no \ - ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR)/host/bin/glib-genmarshal \ + ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOSTPKG)/bin/glib-genmarshal \ ac_cv_func_mmap_fixed_mapped=yes \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes -- cgit v1.2.3