From abb5a8a329c754bca9bd2e58c50f4a1c216aa076 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 4 Apr 2012 21:50:37 +0200 Subject: [PATCH] Skip building Arora if Qt4 repo is not present --- ports/src/app/arora/target.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/src/app/arora/target.mk b/ports/src/app/arora/target.mk index ca24276b0f..f6b52ce4ef 100644 --- a/ports/src/app/arora/target.mk +++ b/ports/src/app/arora/target.mk @@ -2,9 +2,14 @@ ARORA = arora-0.11.0 # identify the qt4 repository by searching for a file that is unique for qt4 QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) + +ifeq ($(QT4_REP_DIR),) +REQUIRES += qt4 +endif + QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc +-include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc HEADERS_FILTER_OUT = \ adblockschemeaccesshandler.h \ @@ -75,4 +80,4 @@ vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/nitpicker vpath % $(REP_DIR)/contrib/$(ARORA)/src/useragent vpath % $(REP_DIR)/contrib/$(ARORA)/src/utils -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc +-include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc