Correct Makefile for the installer
Merge branch 'tetengo2_submodule'