X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=d8cc733be66e4fdd7b4ced026792efa2569da92b;hb=2431be1b68d386bd616378d2c528242775c4d54a;hp=32e85d1e6246fa7aa2fe9576bedb365f6d0559c4;hpb=093f56c5c5c8b0891e837beb1defd84bc165ac6a;p=sliver-openvswitch.git diff --git a/Makefile.am b/Makefile.am index 32e85d1e6..d8cc733be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,10 +27,13 @@ endif # 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:$(top_srcdir)/python/compat:$$PYTHONPATH +else +run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH +endif +run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON) + ALL_LOCAL = BUILT_SOURCES = @@ -276,3 +279,4 @@ include python/automake.mk include python/compat/automake.mk include planetlab/automake.mk include tutorial/automake.mk +include vtep/automake.mk