From 86ac20034ff900c6e54a04dc526bf2e642595260 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Mon, 13 Sep 2010 13:41:31 +0200 Subject: [PATCH] --- yaml --- r: 220655 b: refs/heads/master c: 458452f4a9b61228cf48a4232a19c8d7d686c11b h: refs/heads/master i: 220653: cb82bd43c04cd828d56b3629d0cd858ec6096c13 220651: 1cf996175f84f5a5935f251f7a68b5b365803746 220647: 260516800efd7f0416b3f957d403c4cf447f5652 220639: d8977f4db1329ecacc4f531dcba7fa55fba56f39 v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc5f3adc61f9..a1b850cedd66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20f4ad8a19ad01405f9d6b3110d6eb93666ae21e +refs/heads/master: 458452f4a9b61228cf48a4232a19c8d7d686c11b diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile index 996059ef1c4d..3fbfe98be2b5 100644 --- a/trunk/scripts/kconfig/Makefile +++ b/trunk/scripts/kconfig/Makefile @@ -273,8 +273,8 @@ $(obj)/.tmp_qtcheck: moc="/usr/bin/moc"; \ fi; \ else \ - cflags="\$$(shell pkg-config QtCore --cflags) \$$(shell pkg-config QtGui --cflags) \$$(shell pkg-config Qt3Support --cflags)"; \ - libs="\$$(shell pkg-config QtCore --libs) \$$(shell pkg-config QtGui --libs) \$$(shell pkg-config Qt3Support --libs)"; \ + 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"; \ fi; \