libglib2: move HOST_GLIB detection to glib package

Makes more sense to have it here, and easier to change once we start
building host-glib.

diff --git a/Makefile b/Makefile
index c84a23eaeda8222d19bc2aa852ad0dabf0f260d9..e55771731832b75fa6bec9d3087181cc89603f65 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -132,9 +132,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
 HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
 HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
 HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
-HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
-HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
-
 
 ifndef CFLAGS_FOR_BUILD
 CFLAGS_FOR_BUILD:=-g -O2

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 2cf2459dcfaa17ed7efb22c414269036a9cdf168..14f851c069f30857ed8014116f98d12bb5c76298 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -14,6 +14,10 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
+# detect install prefix of host glib development stuff
+HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
+HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
+
 LIBGLIB2_CONF_ENV =    \
                ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                glib_cv_uscore=no ac_cv_func_strtod=yes \