Merge revision 3514 from trunk:Fix error handling in Makefile for rebuild-stubs and other build rules.