Update Makefile with dmake for the fix of 4399