Commit 54695cc0 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Use HOST_GLIB for glib installation instead of /usr/bin

parent 3f8d9b27
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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))
+1 −1
Original line number Diff line number Diff line
@@ -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))
+1 −1
Original line number Diff line number Diff line
@@ -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


+1 −1
Original line number Diff line number Diff line
@@ -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 = \