Make this actually work both when SRCDIR equals and not equals BUILDIR

Change-Id: I0287820bf0b5a1f0645bd032fb1071db5ce168c5