summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2009-11-15 10:12:56 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-01-27 13:58:08 (GMT)
commitc8bafd26692cc3182be8ac8032c1dd75a04f2672 (patch)
tree6ef041af330cb486188092e56803d973c7111df1
parent96662841910829fd9255b719a701a129189810af (diff)
downloadbuildroot-c8bafd26692cc3182be8ac8032c1dd75a04f2672.tar.gz
buildroot-c8bafd26692cc3182be8ac8032c1dd75a04f2672.tar.bz2
webkit: convert to newstyle autotools infrastructure
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/webkit/webkit.mk17
1 files changed, 9 insertions, 8 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index bc7d062..01baa27 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -9,7 +9,6 @@ WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
WEBKIT_INSTALL_STAGING = YES
WEBKIT_INSTALL_TARGET = YES
-WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite enchant \
@@ -25,11 +24,13 @@ endif
WEBKIT_CONF_OPT += --disable-video
-$(eval $(call AUTOTARGETS,package,webkit))
+define WEBKIT_AUTOGEN_PATCH
+$(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
+# Don't run the configure step yet
+cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
+endef
+
+WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH
-$(WEBKIT_HOOK_POST_EXTRACT):
- $(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
- # Don't run the configure step yet
- cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
- touch $@
+$(eval $(call AUTOTARGETS,package,webkit))