summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-13 21:02:43 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-13 21:02:43 +0000
commit54695cc01ad8a750f80f160d9278281e022d4919 (patch)
tree61f2d6dbf03eba47c0d08f0293beacecf10f79ac /package
parent3f8d9b275fd5d7d3880b1a43ca1885fc22557663 (diff)
Use HOST_GLIB for glib installation instead of /usr/bin
Diffstat (limited to 'package')
-rw-r--r--package/atk/atk.mk2
-rw-r--r--package/iptables/iptables.mk2
-rw-r--r--package/java/classpath/classpath.mk2
-rw-r--r--package/java/jamvm/jamvm.mk2
4 files changed, 5 insertions, 3 deletions
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 9157a9eaa..5bd1a0c50 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -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))
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index fe9a9f6af..fbb5f18ce 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -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))
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 76707871b..367b3d802 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -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
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 869b38be2..3ea6e2147 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -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 = \