From d40d312b07acdd09ef7f17e46446a81f45ecb9d1 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 2 Jan 2006 11:25:30 +0100 Subject: [PATCH] --- yaml --- r: 16659 b: refs/heads/master c: 37193147991a53b2e9f573d0ec47f63a2d4de8dc h: refs/heads/master i: 16657: 08dddcab2828e1c4c4ebb67bab127ea12694eb29 16655: 52a9f1f2a364fb3de530d195059f0cbcd2c05b64 v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68df4633a015..34adaaa90e53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 367cb704212cd0c9273ba2b1e62523139210563b +refs/heads/master: 37193147991a53b2e9f573d0ec47f63a2d4de8dc diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile index 3d7f1ac9e00c..5760e057ecba 100644 --- a/trunk/scripts/kconfig/Makefile +++ b/trunk/scripts/kconfig/Makefile @@ -133,8 +133,8 @@ HOSTCFLAGS_zconf.tab.o := -I$(src) HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK -HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` -HOSTCFLAGS_gconf.o = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \ +HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` +HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ -D LKC_DIRECT_LINK $(obj)/qconf.o: $(obj)/.tmp_qtcheck @@ -193,8 +193,8 @@ ifeq ($(gconf-target),1) # GTK needs some extra effort, too... $(obj)/.tmp_gtkcheck: - @if `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --exists`; then \ - if `pkg-config gtk+-2.0 --atleast-version=2.0.0`; then \ + @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \ + if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ touch $@; \ else \ echo "*"; \