From 52eeb40942c9f7a4852e3dc3d9f7eccf4008ae05 Mon Sep 17 00:00:00 2001 From: Juhani Numminen Date: Thu, 18 Jul 2019 20:32:54 +0300 Subject: [PATCH] Makefile: On Windows, use ; as path separator instead of : --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0be3cd5f..1cb7e1d2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,11 @@ # Makefile for PySolFC -export PYTHONPATH := $(PYTHONPATH):$(CURDIR) +ifeq ($(OS),Windows_NT) + path_sep = ; +else + path_sep = : +endif +export PYTHONPATH := $(PYTHONPATH)$(path_sep)$(CURDIR) .PHONY: all install dist rpm all_games_html rules pot mo pretest test runtest @@ -47,11 +52,11 @@ pretest: rm -f tests/individually-importing/*.py # To avoid stray files python3 scripts/gen_individual_importing_tests.py -TEST_ENV_PATH = $(CURDIR):$(CURDIR)/tests/lib +TEST_ENV_PATH = $(CURDIR)$(path_sep)$(CURDIR)/tests/lib TEST_FILES = tests/style/*.t tests/unit-generated/*.py tests/individually-importing/*.py -test runtest: export PYTHONPATH := $(PYTHONPATH):$(TEST_ENV_PATH) -test runtest: export PERL5LIB := $(PERL5LIB):$(TEST_ENV_PATH) +test runtest: export PYTHONPATH := $(PYTHONPATH)$(path_sep)$(TEST_ENV_PATH) +test runtest: export PERL5LIB := $(PERL5LIB)$(path_sep)$(TEST_ENV_PATH) test: pretest prove $(TEST_FILES)