...at least, Makefile (to be run from within an SDK environment) works again; I
reflected all the relevant changes in Makefile.pln (to be run from no specific
environment) too, but did not actually check the latter

Change-Id: Ie2012d26b3bd59335a0f872bbfc1414cc4f5edc5