fix purely syntactic merge conflict

This commit is contained in:
Zooko O'Whielacronx 2007-02-01 16:07:07 -07:00
parent dd4ad3d542
commit 82a0cd6615

View File

@ -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)