]> err.no Git - linux-2.6/commitdiff
kconfig: fix gconfig with POSIXLY_CORRECT=1
authorAdrian Bunk <bunk@stusta.de>
Mon, 2 Jan 2006 10:25:30 +0000 (11:25 +0100)
committerSam Ravnborg <sam@mars.ravnborg.org>
Fri, 6 Jan 2006 20:49:31 +0000 (21:49 +0100)
This patch fixed "make gconfig" with POSIXLY_CORRECT=1 set.

This issue was reported by Jens Elkner <elkner@linofee.org> in kernel
Bugzilla #2919.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
scripts/kconfig/Makefile

index 3d7f1ac9e00ce89e881673142ef8ca517ca3010a..5760e057ecbac174679bedfe60de520645ec659a 100644 (file)
@@ -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 "*";                                                       \