#2 scp upload dirs patch

[Ville Skyttä]

Hmmph, I don't actually remember exactly what this fixes,
but it had something to do with empty strings in
architecture-specific dirs and scp. I've sent this to
Guillaume previously, maybe he remembers :)

[Ville Skyttä]

fix for scp upload dirs