fix purely syntactic merge conflict

diff --git a/Makefile b/Makefile
index f1caa61bd321a30e0d35a4fca8ed62ed582c09e0..4e1410bb48bc3653f7de77a01ff57661cf05b0ed 100644 (file)
--- 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)