From 877cec0228b6de847e102f9aabdb5b1781ff28a8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 27 Aug 2012 13:02:18 +0200 Subject: Fix make install with WebKit Avoid running "make install" through build-webkit and therefore risk accidentally rebuilding the lot. We call build-webkit either with --release or without, but we never pass --debug. Therefore the build directory is always WebKitBuild/Release. This is a stop-gap for the Qt 5 beta. After the release we'll get rid of qtwebkit.pri altogether and WebKit will be built with just qmake and make. Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131 Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- qtwebkit.pri | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/qtwebkit.pri b/qtwebkit.pri index cb169130..9f69ff0f 100644 --- a/qtwebkit.pri +++ b/qtwebkit.pri @@ -73,13 +73,7 @@ module_qtwebkit_clean.commands = $${OPTI}$${SBC}cd qtwebkit && \ module_qtwebkit_clean.commands += $$escape_expand(\\n)clean: module-qtwebkit-clean module_qtwebkit_clean.target = module-qtwebkit-clean -module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit && \ - $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \ - perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \ - --qt \ - --qmake=$(QMAKE) \ - --install-libs=$$[QT_INSTALL_LIBS] \ - "--makeargs=\"install\"" +module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit/WebKitBuild/Release && $(MAKE) install # Trick to force dependency on this rule. module_qtwebkit_install.commands+= $$escape_expand(\\n)install: module-qtwebkit-install module_qtwebkit_install.target = module-qtwebkit-install -- cgit v1.2.3