Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches c82dab24ed fix cross-compile on Darwin 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu