case 3834 - Fixes in make file to make it finally work.