mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-18 02:40:07 +00:00
fix purely syntactic merge conflict
This commit is contained in:
parent
dd4ad3d542
commit
82a0cd6615
5
Makefile
5
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)
|
||||
|
Loading…
Reference in New Issue
Block a user