From 82a0cd661524d04dd498ce80842369536520205e Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Thu, 1 Feb 2007 16:07:07 -0700 Subject: [PATCH] fix purely syntactic merge conflict --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f1caa61b..4e1410bb 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,10 @@ clean-pyfec: build-Crypto: cd src/Crypto && $(PYTHON) ./setup.py install --prefix=$(BASE)/instdir -INSTDIR=$(PWD)/instdir/lib/python$(shell python -c 'import sys;print sys.version_info[0]').$(shell python -c 'import sys;print sys.version_info[1]')/site-packages +clean-Crypto: + cd src/Crypto && python ./setup.py clean + +INSTDIR=$(BASE)/instdir/lib/python$(shell $(PYTHON) -c 'import sys;print sys.version_info[0]').$(shell $(PYTHON) -c 'import sys;print sys.version_info[1]')/site-packages ifneq ($(PYTHONPATH),) PP=PYTHONPATH=${PYTHONPATH}:$(INSTDIR) -- 2.45.2