Some more generalization on Makefile to be able to work automatically on slc6