summaryrefslogtreecommitdiffstats
path: root/package/webkit/webkit.mk
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-02-23 21:27:28 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-02-23 21:27:28 +0100
commit4f05a61b33e5d87f23837109fb0dd538a5bd5d62 (patch)
treef1b375060271ec5fd5da6fe89955b11b7c238fae /package/webkit/webkit.mk
parent52fcd86f2ba1249e74ed04ef39cb3cbea16024c7 (diff)
parentf08e9eea1b70f057cc0a3efa18b2acb4faea4abe (diff)
downloadbuildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.tar.gz
buildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.zip
Merge branch 'misc-fixes5' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/webkit/webkit.mk')
-rw-r--r--package/webkit/webkit.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 389a5fc25..2121f4b06 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -25,10 +25,12 @@ endif
WEBKIT_CONF_OPT += --disable-video
define WEBKIT_AUTOGEN_PATCH
+$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
$(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
$(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh
+cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/
# Don't run the configure step yet
-cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
+cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
endef
WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH