A second change of trying to build in linux environment.