From: Gurucharan Shetty <gshetty@nicira.com> Date: Sun, 17 Nov 2013 03:23:13 +0000 (-0800) Subject: Makefile.am: Make PYTHONPATH work on Mingw. X-Git-Tag: sliver-openvswitch-2.0.90-1~5^2~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b02e1154658956a0a269652393531d741d23b761;p=sliver-openvswitch.git Makefile.am: Make PYTHONPATH work on Mingw. The ":" used as a seperator does not work when the make is run. ";" is the correct separator. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com> --- diff --git a/Makefile.am b/Makefile.am index b1ad24d9d..f2d129459 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,15 +22,20 @@ 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. if INCLUDE_PYTHON_COMPAT -run_python = PYTHONPATH=$(top_srcdir)/python:$(top_srcdir)/python/compat:$$PYTHONPATH +run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH else -run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH +run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH endif run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)