Changes to makefile and other files to be OBS compatible