From 7e1b67cf2eb6e1750bca74a270802f9fdc6239c6 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Fri, 21 Sep 2007 14:11:16 -0700 Subject: [PATCH] setup: check for the pywin32 dep only on Windows --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8cf620eea..e780c10fe 100644 --- a/Makefile +++ b/Makefile @@ -39,11 +39,13 @@ ifeq ($(PLAT),win32) SUPPORT = $(shell cygpath -w $(shell pwd))\support SUPPORTLIB := $(SUPPORT)\Lib\site-packages SRCPATH := $(shell cygpath -w $(shell pwd))\src + CHECK_PYWIN32_DEP := check-pywin32-dep else PYVER=$(shell $(PYTHON) misc/pyver.py) SUPPORT = $(shell pwd)/support SUPPORTLIB = $(SUPPORT)/lib/$(PYVER)/site-packages SRCPATH := $(shell pwd)/src + CHECK_PYWIN32_DEP := endif ifeq ($(PLAT),cygwin) @@ -103,7 +105,7 @@ endif # TESTING -.PHONY: check-deps check-twisted-dep check-pywin32-dep signal-error-deps, signal-error-twisted-dep, signal-error-pywin32-dep, test test-figleaf figleaf-output +.PHONY: check-deps check-twisted-dep $(CHECK_PYWIN32_DEP) signal-error-deps, signal-error-twisted-dep, signal-error-pywin32-dep, test test-figleaf figleaf-output signal-error-deps: @@ -123,7 +125,7 @@ signal-error-pywin32-dep: for help on installing dependencies." exit 1 -check-deps: check-twisted-dep check-pywin32-dep +check-deps: check-twisted-dep $(CHECK_PYWIN32_DEP) $(PP) \ $(PYTHON) -c 'import allmydata, zfec, foolscap, simplejson, nevow, OpenSSL' || $(MAKE) signal-error-deps