Modify configure and makefile files for lily2