changes to Makefiel and configure.sh