Use HOST_GLIB for glib installation instead of /usr/bin
authorUlf Samuelsson <ulf.samuelsson@atmel.com>
Tue, 13 Jan 2009 21:02:43 +0000 (21:02 -0000)
committerUlf Samuelsson <ulf.samuelsson@atmel.com>
Tue, 13 Jan 2009 21:02:43 +0000 (21:02 -0000)
package/atk/atk.mk
package/iptables/iptables.mk
package/java/classpath/classpath.mk
package/java/jamvm/jamvm.mk

index 9157a9eaa5d596c5812b45f99ac05d82e2930135..5bd1a0c50438db3e8325a795488892daa8d3758b 100644 (file)
@@ -54,6 +54,8 @@ ATK_CONF_OPT =  --enable-shared \
                --disable-glibtest --enable-explicit-deps=no \
                --disable-debug
 
+ATK_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
+
 ATK_DEPENDENCIES = libglib2 pkgconfig
 
 $(eval $(call AUTOTARGETS,package,atk))
index fe9a9f6af5df0fc82b8271be377198d796761ca0..fbb5f18ce34117f13732a57e02e4e62746b71958 100644 (file)
@@ -13,6 +13,6 @@ IPTABLES_INSTALL_TARGET = YES
 IPTABLES_AUTORECONF = YES
 IPTABLES_DEPENDENCIES =
 IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR)
-IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin
+IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
 
 $(eval $(call AUTOTARGETS,package,iptables))
index 76707871be483b3b0f6114236c23cc1e0258fa00..367b3d8021eaa6e42205881aebfee945ffd5c40b 100644 (file)
@@ -41,7 +41,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
                ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
                ac_use_included_regex=no gl_cv_c_restrict=no \
-               ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
+               ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/glib-genmarshal \
                ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
 
 
index 869b38be2f71c0220316c4d5817798aac44ee18b..3ea6e2147e4ec41b2b85bf17d335b382cfa0b85c 100644 (file)
@@ -39,7 +39,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
                ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
                ac_use_included_regex=no gl_cv_c_restrict=no \
-               ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
+               ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/glib-genmarshal \
                ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
 
 JAMVM_CONF_OPT = \