1 files changed, 22 insertions, 19 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 79662658fb91..77d53999ffb9 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -114,7 +114,7 @@ help:
         @echo  '  alldefconfig    - New config with all symbols set to default'
         @echo  '  randconfig      - New config with random answer to all options'
         @echo  '  listnewconfig   - List new options'
-        @echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
+        @echo  '  oldnoconfig     - Same as silentoldconfig but sets new symbols to their default value'
 
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -234,12 +234,12 @@ $(obj)/.tmp_qtcheck:
                 if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
               done; \
               if [ -z "$$dir" ]; then \
-                echo "*"; \
-                echo "* Unable to find any QT installation. Please make sure that"; \
-                echo "* the QT4 or QT3 development package is correctly installed and"; \
-                echo "* either qmake can be found or install pkg-config or set"; \
-                echo "* the QTDIR environment variable to the correct location."; \
-                echo "*"; \
+                echo >&2 "*"; \
+                echo >&2 "* Unable to find any QT installation. Please make sure that"; \
+                echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \
+                echo >&2 "* either qmake can be found or install pkg-config or set"; \
+                echo >&2 "* the QTDIR environment variable to the correct location."; \
+                echo >&2 "*"; \
                 false; \
               fi; \
               libpath=$$dir/lib; lib=qt; osdir=""; \
@@ -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" >> $@; \
@@ -279,17 +279,17 @@ $(obj)/.tmp_gtkcheck:
                 if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then                  \
                         touch $@;                                                               \
                 else                                                                    \
-                        echo "*";                                                       \
-                        echo "* GTK+ is present but version >= 2.0.0 is required.";     \
-                        echo "*";                                                       \
+                        echo >&2 "*";                                                   \
+                        echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \
+                        echo >&2 "*";                                                   \
                         false;                                                          \
                 fi                                                                      \
         else                                                                            \
-                echo "*";                                                               \
-                echo "* Unable to find the GTK+ installation. Please make sure that";   \
-                echo "* the GTK+ 2.0 development package is correctly installed...";    \
-                echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";                 \
-                echo "*";                                                               \
+                echo >&2 "*";                                                           \
+                echo >&2 "* Unable to find the GTK+ installation. Please make sure that";       \
+                echo >&2 "* the GTK+ 2.0 development package is correctly installed...";        \
+                echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";             \
+                echo >&2 "*";                                                           \
                 false;                                                                  \
         fi
 endif
@@ -298,8 +298,11 @@ $(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
 
 $(obj)/qconf.o: $(obj)/qconf.moc
 
-$(obj)/%.moc: $(src)/%.h
-        $(KC_QT_MOC) -i $< -o $@
+quiet_cmd_moc = MOC     $@
+      cmd_moc = $(KC_QT_MOC) -i $< -o $@
+
+$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
+        $(call cmd,moc)
 
 # Extract gconf menu items for I18N support
 $(obj)/gconf.glade.h: $(obj)/gconf.glade