X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=0af7b46155265b957da6cb2d04443d1e1ce5bb94;hb=99ab7312c17cd4ab603eb6194c50b9f1ef3ca1c9;hp=32e85d1e6246fa7aa2fe9576bedb365f6d0559c4;hpb=cc36576070df622d0fc7a6e26ce01027e12b5b59;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 32e85d1e6..0af7b4615 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,15 +22,23 @@ AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
 endif
 
+if WIN32
+psep=";"
+else
+psep=":"
+endif
 # PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
 # files.  Creating .py[co] works OK for any given version of Open
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-run_python = \
-	PYTHONDONTWRITEBYTECODE=yes \
-	PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
-	$(PYTHON)
+if INCLUDE_PYTHON_COMPAT
+run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH
+else
+run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH
+endif
+run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -276,3 +284,4 @@ include python/automake.mk
 include python/compat/automake.mk
 include planetlab/automake.mk
 include tutorial/automake.mk
+include vtep/automake.mk