fix makefile, and remove now-unneeded dirs in debian packaging