Land b_smallfix onto HEAD (20040416_1638) (more 2.6 build fixes)

[fs/lustre-release.git] / lustre / kernel-tests / Makefile

diff --git a/lustre/kernel-tests/Makefile b/lustre/kernel-tests/Makefile
index 959a2d5..7360935 100644 (file)
--- a/lustre/kernel-tests/Makefile
+++ b/lustre/kernel-tests/Makefile
@@ -1,5 +1,24 @@
+ifeq ($(PATCHLEVEL),)
+
+ifneq ($(LUSTRE_LINUX_CONFIG),)
+include $(LUSTRE_LINUX_CONFIG)
+endif
+include Makefile
+
+else
+
+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