From: Zooko O'Whielacronx Date: Thu, 1 Feb 2007 23:07:07 +0000 (-0700) Subject: fix purely syntactic merge conflict X-Git-Url: https://git.rkrishnan.org/%5B/frontends/-?a=commitdiff_plain;h=82a0cd661524d04dd498ce80842369536520205e;p=tahoe-lafs%2Ftahoe-lafs.git fix purely syntactic merge conflict --- 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)