Use HOST_GLIB for glib installation instead of /usr/bin

This commit is contained in:
Ulf Samuelsson 2009-01-13 21:02:43 +00:00
parent 3f8d9b275f
commit 54695cc01a
4 changed files with 5 additions and 3 deletions

View File

@ -54,6 +54,8 @@ ATK_CONF_OPT = --enable-shared \
--disable-glibtest --enable-explicit-deps=no \ --disable-glibtest --enable-explicit-deps=no \
--disable-debug --disable-debug
ATK_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
ATK_DEPENDENCIES = libglib2 pkgconfig ATK_DEPENDENCIES = libglib2 pkgconfig
$(eval $(call AUTOTARGETS,package,atk)) $(eval $(call AUTOTARGETS,package,atk))

View File

@ -13,6 +13,6 @@ IPTABLES_INSTALL_TARGET = YES
IPTABLES_AUTORECONF = YES IPTABLES_AUTORECONF = YES
IPTABLES_DEPENDENCIES = IPTABLES_DEPENDENCIES =
IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR) 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)) $(eval $(call AUTOTARGETS,package,iptables))

View 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 \ 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_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \ 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 ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no

View 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 \ 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_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \ 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 ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
JAMVM_CONF_OPT = \ JAMVM_CONF_OPT = \