Fixing Makefile (and avoid conflict between OpenCV 2.3 and OpenCV 2.4)