Makefile, further if-else corrections