ovs-brcompatd: Run ovs-vsctl instead of accessing database directly.

[openvswitch] / datapath / linux-2.6 / Makefile.main.in

diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux-2.6/Makefile.main.in
index fd231e6968c731dd4df1910fdcc253a80dac3ad1..74bed7841c66d605a545d1e31cbba138275c8635 100644 (file)
--- a/datapath/linux-2.6/Makefile.main.in
+++ b/datapath/linux-2.6/Makefile.main.in
@@ -4,8 +4,6 @@ export srcdir = @abs_srcdir@
 export top_srcdir = @abs_top_srcdir@
 export KSRC = @KBUILD26@
 export VERSION = @VERSION@
-export BUILD_VETH = @BUILD_VETH@
-export BUILD_GRE = @BUILD_GRE@
 
 include $(srcdir)/../Modules.mk
 include $(srcdir)/Modules.mk
@@ -42,13 +40,19 @@ 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