Changed some stuff to allow correct generation of po/Makefile after a