X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FMakefile;h=d00981fa882b22f8ab8b918f4cf3757eb7dadf6c;hb=9699de55bfa4a35aea21f713b80d33ec2f9329fe;hp=db3bd45b05784991f1c52ce051d8f2174a462108;hpb=2ec4f8cc2c890edcd2199c92113438c8584b78b7;p=fs%2Flustre-release.git

diff --git a/build/Makefile b/build/Makefile
index db3bd45..d00981f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,15 +1,17 @@
 #
-# There are three ways this Makefile can be called:
+# There are four ways this Makefile can be called:
+#
 #
-# 
 # 1.  As a subdirectory from the toplevel, for automake
 #
-# 2. A wrapper around the kernel's makefile when building modules, to
-#    possibly override the .config file
+# 2.  A wrapper around the kernel's makefile when building modules, to
+#     possibly override the .config file
 #
 # 3.  At configure time, as the toplevel module dir for building
 #     kernel tests
 #
+# 4.  At configure time, to determine the kernel's idea of $(ARCH)
+#
 
 ifeq ($(PATCHLEVEL),)
 
@@ -21,6 +23,8 @@ include autoMakefile
 else
 
 # case #2
+# Note that this comes from make -C $LINUX -f $LUSTRE/build/Makefile
+# so "include Makefile" below includes $LINUX/Makefile, not this file
 include $(LUSTRE_LINUX_CONFIG)
 include Makefile
 
@@ -31,17 +35,14 @@ else # PATCHLEVEL
 # case 3
 
 ifneq ($(LUSTRE_KERNEL_TEST),)
-ifeq ($(PATCHLEVEL),4)
-all: $(LUSTRE_KERNEL_TEST)
-else
 extra-y = $(LUSTRE_KERNEL_TEST)
 endif
-endif
 
 obj-m := conftest.o
 
-ifeq ($(PATCHLEVEL),4)
-include $(TOPDIR)/Rules.make
-endif
-
 endif # PATCHLEVEL
+
+# case 4
+
+echoarch:
+	echo $(ARCH) >$(ARCHFILE)