4 files changed, 8 insertions, 7 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 52c34b914fc7..368ae306aee4 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck:
               moc="/usr/bin/moc"; \
             fi; \
         else \
-          headerpath="\$$(shell qmake -query QT_INSTALL_HEADERS)"; \
-          libpath="\$$(shell qmake -query QT_INSTALL_LIBS)"; \
-          binpath="\$$(shell qmake -query QT_INSTALL_BINS)"; \
-          cflags="-I$$headerpath -I$$headerpath/QtCore -I$$headerpath/QtGui -I$$headerpath/Qt3Support -DQT3_SUPPORT"; \
-          libs="-L$$libpath -Wl,-rpath,$$libpath -lQtCore -lQtGui -lQt3Support"; \
-          moc="$$binpath/moc"; \
+          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; \
         echo "KC_QT_CFLAGS=$$cflags" > $@; \
         echo "KC_QT_LIBS=$$libs" >> $@; \
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index d52b0a75d824..aa483cb32755 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -1,5 +1,4 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
 
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f59d553..82cc3a85e7f8 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -23,6 +23,8 @@ ccflags()
                 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
         elif [ -f /usr/include/ncurses/curses.h ]; then
                 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+        elif [ -f /usr/include/ncursesw/curses.h ]; then
+                echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
         elif [ -f /usr/include/ncurses.h ]; then
                 echo '-DCURSES_LOC="<ncurses.h>"'
         else
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 545e1af7cb68..a2969fdc66b4 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1256,6 +1256,8 @@ static void show_help(struct menu *menu)
                         str_append(&help, _(menu_get_help(menu)));
                         str_append(&help, "\n");
                         get_symbol_str(&help, menu->sym);
+                } else {
+                        str_append(&help, _(menu_get_help(menu)));
                 }
         } else {
                 str_append(&help, nohelp_text);