X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux-2.6%2FMakefile.main.in;h=1edfc34120b67a7fdd526dca9fd4ee57df5ab43b;hb=71fe9970f7bc88a20b307e55f924c21029af98f2;hp=967e2f7bcff1953fffbcb3d5c1e3c2ebdbc3b2f1;hpb=7c9e113b712e72fcb4ccc6075da7334cb3391059;p=sliver-openvswitch.git

diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux-2.6/Makefile.main.in
index 967e2f7bc..1edfc3412 100644
--- a/datapath/linux-2.6/Makefile.main.in
+++ b/datapath/linux-2.6/Makefile.main.in
@@ -2,9 +2,8 @@
 export builddir = @abs_builddir@
 export srcdir = @abs_srcdir@
 export top_srcdir = @abs_top_srcdir@
-export KSRC = @KBUILD26@
+export KSRC = @KBUILD@
 export VERSION = @VERSION@
-export BUILD_VETH = @BUILD_VETH@
 
 include $(srcdir)/../Modules.mk
 include $(srcdir)/Modules.mk
@@ -32,22 +31,24 @@ else
   KOBJ := $(KSRC)
 endif
 
-ifneq ($(shell grep -c 'PATCHLEVEL = 6' $(KSRC)/Makefile),1)
-  $(error Linux kernel source in $(KSRC) not 2.6)
-endif
-
 VERSION_FILE := $(KOBJ)/include/linux/version.h
 ifeq (,$(wildcard $(VERSION_FILE)))
   $(error Linux kernel source not configured - missing version.h)
 endif
 
-CONFIG_FILE := $(KSRC)/include/linux/autoconf.h
+CONFIG_FILE := $(KSRC)/include/generated/autoconf.h
 ifeq (,$(wildcard $(CONFIG_FILE)))
-  $(error Linux kernel source not configured - missing autoconf.h)
+  CONFIG_FILE := $(KSRC)/include/linux/autoconf.h
+  ifeq (,$(wildcard $(CONFIG_FILE)))
+    $(error Linux kernel source not configured - missing autoconf.h)
+  endif
 endif
 
 default:
 	$(MAKE) -C $(KSRC) M=$(builddir) modules
+
+modules_install:
+	$(MAKE) -C $(KSRC) M=$(builddir) modules_install
 endif
 
 # Much of the kernel build system in this file is derived from Intel's