From: brian <brian>
Date: Fri, 28 Oct 2005 19:36:48 +0000 (+0000)
Subject: r=nic
X-Git-Tag: 1.4.10~399
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=12b66e3338b2e1dbfa5925cff3b146088b8cb1e0;p=fs%2Flustre-release.git

r=nic
Look in the right place for *config targets for kernel make.
---

diff --git a/build/lmake b/build/lmake
index 8541510..a1e07b8 100755
--- a/build/lmake
+++ b/build/lmake
@@ -354,8 +354,14 @@ depend_kernel()
     $MAKE "$MAKE_CC" mrproper || fatal 1 "Error running make mrproper"
     rm -f rpm-release
     cp "$CONFIG_FILE" .config
-    for oc in oldconfig_nonint silentoldconfig oldconfig ; do
-	if grep -q "^$oc:" Makefile ; then
+    # find the right file to grep in for the target
+    for makefile in scripts/kconfig/Makefile Makefile; do
+        if [ -f $makefile ]; then
+	    break
+	fi
+    done
+    for oc in nonint_oldconfig silentoldconfig oldconfig ; do
+	if grep -q "^$oc:" $makefile ; then
 	    $MAKE "$MAKE_CC" $oc || fatal 1 "Error running make oldconfig ($oc)"
 	    break
 	fi