From patchwork Wed Jul 4 20:23:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yaakov (Cygwin/X)" X-Patchwork-Id: 1157311 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2CE743FC36 for ; Wed, 4 Jul 2012 20:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755654Ab2GDUXy (ORCPT ); Wed, 4 Jul 2012 16:23:54 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:51206 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466Ab2GDUXy (ORCPT ); Wed, 4 Jul 2012 16:23:54 -0400 Received: by yenl2 with SMTP id l2so6782887yen.19 for ; Wed, 04 Jul 2012 13:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=/bC4GXE1B+WABHpa+tnw13DvivLy5zmC6DkNLSydoyA=; b=fmcM2tVlJNim6wJgxXwGNDdAB6iKaRUSfaho10LhSeEygEacfosR0dniykCPOu13mF 29Rw96vJ+1ALIKPTv7UrfyGUTacIzIVkVsaM3asTlrw9lia84IojHM+DtPL//Sq+rnW1 V5DpMbP1OAXbWr3kK/9zcKd/YaTGLQx8cH3Hs/YciiHnt9hk8abbgbJlYRngkCoPg4o0 Oa5dc4TmsLdaHuqXpbwvq1wxcRJN2UyB2NlVAY7X7XpZmTe8NT3TyYg5nyYljtm92/Jo R0PxIUrjsXo4NEBfZP5RAPznnFSstAFWuvDbdZucOPhyqmDG3xqXojEfmqdH7dNBT9rI ZZBA== Received: by 10.43.103.196 with SMTP id dj4mr12037971icc.20.1341433433336; Wed, 04 Jul 2012 13:23:53 -0700 (PDT) Received: from yselkowitz@gmail.com (S0106000cf16f58b1.wp.shawcable.net. [24.79.200.150]) by mx.google.com with ESMTPS id bj4sm14633630igc.16.2012.07.04.13.23.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jul 2012 13:23:52 -0700 (PDT) Received: by yselkowitz@gmail.com (sSMTP sendmail emulation); Wed, 04 Jul 2012 15:23:54 -0500 From: "Yaakov (Cygwin/X)" To: mmarek@suse.cz Cc: linux-kbuild@vger.kernel.org Subject: [PATCH] xconfig: use pkgconfig to find moc Date: Wed, 4 Jul 2012 15:23:29 -0500 Message-Id: <1341433409-5764-1-git-send-email-yselkowitz@users.sourceforge.net> X-Mailer: git-send-email 1.7.9 In-Reply-To: <20120704163351.GB12094@sepie.suse.cz> References: <20120704163351.GB12094@sepie.suse.cz> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Yaakov Selkowitz Various schemes exist to allow parallel installations of multiple major versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x). QtCore.pc includes a moc_location variable which should be a more reliable way to find moc. Signed-off-by: Yaakov Selkowitz --- scripts/kconfig/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7966265..5e2176c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck: else \ cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ - binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ - moc="$$binpath/bin/moc"; \ + moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \ + [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \ fi; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \