tune fish config
fix GNUmakefile