repair expansion of filename macros

Commit ec14a51b introduced this regression.

Change-Id: Ieabd8ccf859456eba0a42fc39f42889f67115f0f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>